History

git_handler: use repo.__getitem__ instead of (removed) repo.changectx

As stated in https://phab.mercurial-scm.org/D3037, repo.__getitem__ should be used instead of repo.changectx, which was removed.

Paul Morelle committed 8 years ago

Commit e6932f21 parent 3d6e4b91 file · +4 −4Browse files

Unified · Split

hggit/git_handler.py+4−4
@@ -550,7 +550,7 @@ class GitHandler(object): · 549 unmodified lines
550 550
551 oldenc = self.swap_out_encoding()551 oldenc = self.swap_out_encoding()
552 552
553 ctx = self.repo.changectx(rev)553 ctx = self.repo[rev]
554 extra = ctx.extra()554 extra = ctx.extra()
555 555
556 commit = Commit()556 commit = Commit()
@@ -874,7 +874,7 @@ class GitHandler(object): · 317 unmodified lines
874 self.git_file_readlines(git_commit_tree, '.hgsubstate'))874 self.git_file_readlines(git_commit_tree, '.hgsubstate'))
875 parentsubdata = ''875 parentsubdata = ''
876 if gparents:876 if gparents:
877 p1ctx = self.repo.changectx(gparents[0])877 p1ctx = self.repo[gparents[0]]
878 if '.hgsubstate' in p1ctx:878 if '.hgsubstate' in p1ctx:
879 parentsubdata = p1ctx.filectx('.hgsubstate').data()879 parentsubdata = p1ctx.filectx('.hgsubstate').data()
880 parentsubdata = parentsubdata.splitlines()880 parentsubdata = parentsubdata.splitlines()
@@ -958,8 +958,8 @@ class GitHandler(object): · 77 unmodified lines
958 # begin with).958 # begin with).
959 if p2 == nullid:959 if p2 == nullid:
960 return []960 return []
961 manifest1 = self.repo.changectx(p1).manifest()961 manifest1 = self.repo[p1].manifest()
962 manifest2 = self.repo.changectx(p2).manifest()962 manifest2 = self.repo[p2].manifest()
963 return [path for path, node1 in manifest1.iteritems() if path not963 return [path for path, node1 in manifest1.iteritems() if path not
964 in files and manifest2.get(path, node1) != node1]964 in files and manifest2.get(path, node1) != node1]
965 965

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t