##// END OF EJS Templates
commitctx: move a tiny else clause above the very long one...
marmoute -
r45751:55464c0b default
parent child Browse files
Show More
@@ -3109,7 +3109,11 b' class localrepository(object):'
3109 if writechangesetcopy:
3109 if writechangesetcopy:
3110 filesadded = ctx.filesadded()
3110 filesadded = ctx.filesadded()
3111 filesremoved = ctx.filesremoved()
3111 filesremoved = ctx.filesremoved()
3112 elif ctx.files():
3112 elif not ctx.files():
3113 self.ui.debug(b'reusing manifest from p1 (no file change)\n')
3114 mn = p1.manifestnode()
3115 files = []
3116 else:
3113 m1ctx = p1.manifestctx()
3117 m1ctx = p1.manifestctx()
3114 m2ctx = p2.manifestctx()
3118 m2ctx = p2.manifestctx()
3115 mctx = m1ctx.copy()
3119 mctx = m1ctx.copy()
@@ -3205,10 +3209,6 b' class localrepository(object):'
3205 b'actually unchanged)\n'
3209 b'actually unchanged)\n'
3206 )
3210 )
3207 mn = p1.manifestnode()
3211 mn = p1.manifestnode()
3208 else:
3209 self.ui.debug(b'reusing manifest from p1 (no file change)\n')
3210 mn = p1.manifestnode()
3211 files = []
3212
3212
3213 if writecopiesto == b'changeset-only':
3213 if writecopiesto == b'changeset-only':
3214 # If writing only to changeset extras, use None to indicate that
3214 # If writing only to changeset extras, use None to indicate that
General Comments 0
You need to be logged in to leave comments. Login now