Show More
@@ -890,7 +890,6 def tryimportone(ui, repo, hunk, parents | |||||
890 | msg = _('applied to working directory') |
|
890 | msg = _('applied to working directory') | |
891 |
|
891 | |||
892 | rejects = False |
|
892 | rejects = False | |
893 | dsguard = None |
|
|||
894 |
|
893 | |||
895 | try: |
|
894 | try: | |
896 | cmdline_message = logmessage(ui, opts) |
|
895 | cmdline_message = logmessage(ui, opts) | |
@@ -932,7 +931,6 def tryimportone(ui, repo, hunk, parents | |||||
932 |
|
931 | |||
933 | n = None |
|
932 | n = None | |
934 | if update: |
|
933 | if update: | |
935 | dsguard = dirstateguard(repo, 'tryimportone') |
|
|||
936 | if p1 != parents[0]: |
|
934 | if p1 != parents[0]: | |
937 | updatefunc(repo, p1.node()) |
|
935 | updatefunc(repo, p1.node()) | |
938 | if p2 != parents[1]: |
|
936 | if p2 != parents[1]: | |
@@ -983,7 +981,6 def tryimportone(ui, repo, hunk, parents | |||||
983 | extrapostimportmap[idfunc](repo[n]) |
|
981 | extrapostimportmap[idfunc](repo[n]) | |
984 | finally: |
|
982 | finally: | |
985 | repo.ui.restoreconfig(allowemptyback) |
|
983 | repo.ui.restoreconfig(allowemptyback) | |
986 | dsguard.close() |
|
|||
987 | else: |
|
984 | else: | |
988 | if opts.get('exact') or opts.get('import_branch'): |
|
985 | if opts.get('exact') or opts.get('import_branch'): | |
989 | branch = branch or 'default' |
|
986 | branch = branch or 'default' | |
@@ -1021,7 +1018,6 def tryimportone(ui, repo, hunk, parents | |||||
1021 | msg = _('created %s') % short(n) |
|
1018 | msg = _('created %s') % short(n) | |
1022 | return (msg, n, rejects) |
|
1019 | return (msg, n, rejects) | |
1023 | finally: |
|
1020 | finally: | |
1024 | lockmod.release(dsguard) |
|
|||
1025 | os.unlink(tmpname) |
|
1021 | os.unlink(tmpname) | |
1026 |
|
1022 | |||
1027 | # facility to let extensions include additional data in an exported patch |
|
1023 | # facility to let extensions include additional data in an exported patch |
General Comments 0
You need to be logged in to leave comments.
Login now