diff options
| author | Dusty Phillips <dusty@linux.ca> | 2013-04-22 16:55:09 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 15:25:53 -0700 |
| commit | 3473ecd7ffc97d45ebed7374e129da16eb4e1357 (patch) | |
| tree | e46cb7c8ad26169f973aa38046f838525f865c76 | |
| parent | 118f60ee06612083ff4f1810424e80a3e896f73e (diff) | |
| download | git-3473ecd7ffc97d45ebed7374e129da16eb4e1357.tar.gz | |
remote-helpers: avoid has_key
It is deprecated.
[fc: do the same in remote-bzr]
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 2 | ||||
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index aa7bc97bee..cc6609b2f8 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 diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 548133121d..2cd1996626 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -129,7 +129,7 @@ class Marks: self.last_mark = mark def is_marked(self, rev): - return self.marks.has_key(str(rev)) + return str(rev) in self.marks def get_tip(self, branch): return self.tips.get(branch, 0) |