1027 'the created commit'))) |
1027 'the created commit'))) |
1028 |
1028 |
1029 @eh.wrapfunction(mercurial.cmdutil, 'tryimportone') |
1029 @eh.wrapfunction(mercurial.cmdutil, 'tryimportone') |
1030 def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs): |
1030 def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs): |
1031 extracted = patch.extract(ui, hunk) |
1031 extracted = patch.extract(ui, hunk) |
1032 expected = extracted[5] |
1032 if util.safehasattr(extracted, 'get'): |
|
1033 # mercurial 3.6 return a dictionary there |
|
1034 expected = extracted.get('nodeid') |
|
1035 else: |
|
1036 expected = extracted[5] |
1033 if expected is not None: |
1037 if expected is not None: |
1034 expected = node.bin(expected) |
1038 expected = node.bin(expected) |
1035 oldextract = patch.extract |
1039 oldextract = patch.extract |
1036 try: |
1040 try: |
1037 patch.extract = lambda ui, hunk: extracted |
1041 patch.extract = lambda ui, hunk: extracted |