Show More
@@ -1,4 +1,6 b'' | |||||
1 | test-abort-checkin.t |
|
1 | test-abort-checkin.t | |
|
2 | test-absorb-phase.t | |||
|
3 | test-absorb-strip.t | |||
2 | test-add.t |
|
4 | test-add.t | |
3 | test-addremove-similar.t |
|
5 | test-addremove-similar.t | |
4 | test-addremove.t |
|
6 | test-addremove.t |
@@ -245,7 +245,7 b' def overlaycontext(memworkingcopy, ctx, ' | |||||
245 | date = ctx.date() |
|
245 | date = ctx.date() | |
246 | desc = ctx.description() |
|
246 | desc = ctx.description() | |
247 | user = ctx.user() |
|
247 | user = ctx.user() | |
248 |
files = set(ctx.files()).union(memworkingcopy |
|
248 | files = set(ctx.files()).union(memworkingcopy) | |
249 | store = overlaystore(ctx, memworkingcopy) |
|
249 | store = overlaystore(ctx, memworkingcopy) | |
250 | return context.memctx( |
|
250 | return context.memctx( | |
251 | repo=ctx.repo(), parents=parents, text=desc, |
|
251 | repo=ctx.repo(), parents=parents, text=desc, | |
@@ -286,7 +286,7 b' class filefixupstate(object):' | |||||
286 |
|
286 | |||
287 | # following fields are built from fctxs. they exist for perf reason |
|
287 | # following fields are built from fctxs. they exist for perf reason | |
288 | self.contents = [f.data() for f in fctxs] |
|
288 | self.contents = [f.data() for f in fctxs] | |
289 | self.contentlines = map(mdiff.splitnewlines, self.contents) |
|
289 | self.contentlines = pycompat.maplist(mdiff.splitnewlines, self.contents) | |
290 | self.linelog = self._buildlinelog() |
|
290 | self.linelog = self._buildlinelog() | |
291 | if self.ui.debugflag: |
|
291 | if self.ui.debugflag: | |
292 | assert self._checkoutlinelog() == self.contents |
|
292 | assert self._checkoutlinelog() == self.contents | |
@@ -805,7 +805,7 b' class fixupstate(object):' | |||||
805 | return False |
|
805 | return False | |
806 | pctx = parents[0] |
|
806 | pctx = parents[0] | |
807 | # ctx changes more files (not a subset of memworkingcopy) |
|
807 | # ctx changes more files (not a subset of memworkingcopy) | |
808 |
if not set(ctx.files()).issubset(set(memworkingcopy |
|
808 | if not set(ctx.files()).issubset(set(memworkingcopy)): | |
809 | return False |
|
809 | return False | |
810 | for path, content in memworkingcopy.iteritems(): |
|
810 | for path, content in memworkingcopy.iteritems(): | |
811 | if path not in pctx or path not in ctx: |
|
811 | if path not in pctx or path not in ctx: |
General Comments 0
You need to be logged in to leave comments.
Login now