diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:19:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:19:03 -0700 |
| commit | c8c82b1ba3fd03b3de4d2c6c760b75726f519cb8 (patch) | |
| tree | add6bbaf9227539ff8843f839a5fb258780f29fa /contrib/remote-helpers/git-remote-bzr | |
| parent | Merge branch 'fc/remote-bzr' (diff) | |
| parent | remote-hg: strip extra newline (diff) | |
| download | tgif-c8c82b1ba3fd03b3de4d2c6c760b75726f519cb8.tar.xz | |
Merge branch 'fc/remote-hg'
* fc/remote-hg:
remote-hg: strip extra newline
remote-hg: use marks instead of inlined files
remote-hg: small performance improvement
remote-hg: allow refs with spaces
remote-hg: don't update bookmarks unnecessarily
remote-hg: add support for schemes extension
remote-hg: improve email sanitation
remote-hg: add custom local tag write code
remote-hg: write tags in the appropriate branch
remote-hg: custom method to write tags
remote-hg: add support for tag objects
remote-hg: add branch_tip() helper
remote-hg: properly mark branches up-to-date
remote-hg: use python urlparse
remote-hg: safer bookmark pushing
remote-helpers: avoid has_key
Diffstat (limited to 'contrib/remote-helpers/git-remote-bzr')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index a622122c86..dcda351d35 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -94,7 +94,7 @@ class Marks: return self.last_mark def is_marked(self, rev): - return self.marks.has_key(rev) + return str(rev) in self.marks def new_mark(self, rev, mark): self.marks[rev] = mark |