~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Committer: Martin Pool
Date: 2005-11-23 06:29:27 UTC
mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1512.
Revision ID: mbp@sourcefrog.net-20051123062927-f33c0abd742146af

[patch] show number of revisions pushed/pulled/merged (Robey Pointer)

files modified:
NEWS

bzrlib/branch.py

bzrlib/builtins.py

bzrlib/merge.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/branch.py

1117

"""See Branch.pull."""

1118

source.lock_read()

1119

try:

1120

old_count = len(self.revision_history())

1120

1121

try:

1121

1122

self.update_revisions(source)

1122

1123

except DivergedBranches:

1123

1124

if not overwrite:

1124

1125

raise

1125

1126

self.set_revision_history(source.revision_history())

1127

new_count = len(self.revision_history())

1128

return new_count - old_count

1126

1129

finally:

1127

1130

source.unlock()

1128

1131

Older »