1138 repo.status = overridestatus |
1138 repo.status = overridestatus |
1139 orig(ui, repo, *dirs, **opts) |
1139 orig(ui, repo, *dirs, **opts) |
1140 repo.status = oldstatus |
1140 repo.status = oldstatus |
1141 |
1141 |
1142 def overriderollback(orig, ui, repo, **opts): |
1142 def overriderollback(orig, ui, repo, **opts): |
1143 result = orig(ui, repo, **opts) |
|
1144 merge.update(repo, node=None, branchmerge=False, force=True, |
|
1145 partial=lfutil.isstandin) |
|
1146 wlock = repo.wlock() |
1143 wlock = repo.wlock() |
1147 try: |
1144 try: |
|
1145 result = orig(ui, repo, **opts) |
|
1146 merge.update(repo, node=None, branchmerge=False, force=True, |
|
1147 partial=lfutil.isstandin) |
|
1148 |
1148 lfdirstate = lfutil.openlfdirstate(ui, repo) |
1149 lfdirstate = lfutil.openlfdirstate(ui, repo) |
1149 lfiles = lfutil.listlfiles(repo) |
1150 lfiles = lfutil.listlfiles(repo) |
1150 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev()) |
1151 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev()) |
1151 for file in lfiles: |
1152 for file in lfiles: |
1152 if file in oldlfiles: |
1153 if file in oldlfiles: |