equal
deleted
inserted
replaced
2050 tr = self.transaction("commit") |
2050 tr = self.transaction("commit") |
2051 trp = weakref.proxy(tr) |
2051 trp = weakref.proxy(tr) |
2052 |
2052 |
2053 if ctx.manifestnode(): |
2053 if ctx.manifestnode(): |
2054 # reuse an existing manifest revision |
2054 # reuse an existing manifest revision |
|
2055 self.ui.debug('reusing known manifest\n') |
2055 mn = ctx.manifestnode() |
2056 mn = ctx.manifestnode() |
2056 files = ctx.files() |
2057 files = ctx.files() |
2057 elif ctx.files(): |
2058 elif ctx.files(): |
2058 m1ctx = p1.manifestctx() |
2059 m1ctx = p1.manifestctx() |
2059 m2ctx = p2.manifestctx() |
2060 m2ctx = p2.manifestctx() |
2098 mn = mctx.write(trp, linkrev, |
2099 mn = mctx.write(trp, linkrev, |
2099 p1.manifestnode(), p2.manifestnode(), |
2100 p1.manifestnode(), p2.manifestnode(), |
2100 added, drop) |
2101 added, drop) |
2101 files = changed + removed |
2102 files = changed + removed |
2102 else: |
2103 else: |
|
2104 self.ui.debug('reusing manifest from p1 (no file change)\n') |
2103 mn = p1.manifestnode() |
2105 mn = p1.manifestnode() |
2104 files = [] |
2106 files = [] |
2105 |
2107 |
2106 # update changelog |
2108 # update changelog |
2107 self.ui.note(_("committing changelog\n")) |
2109 self.ui.note(_("committing changelog\n")) |