equal
deleted
inserted
replaced
8 from __future__ import absolute_import |
8 from __future__ import absolute_import |
9 |
9 |
10 import os |
10 import os |
11 |
11 |
12 from .i18n import _ |
12 from .i18n import _ |
13 from .node import ( |
13 from .node import hex |
14 hex, |
|
15 nullid, |
|
16 ) |
|
17 from . import ( |
14 from . import ( |
18 error, |
15 error, |
19 match as matchmod, |
16 match as matchmod, |
20 merge as mergemod, |
17 merge as mergemod, |
21 mergestate as mergestatemod, |
18 mergestate as mergestatemod, |
175 referenced profiles from parents of the working directory. |
172 referenced profiles from parents of the working directory. |
176 """ |
173 """ |
177 revs = [ |
174 revs = [ |
178 repo.changelog.rev(node) |
175 repo.changelog.rev(node) |
179 for node in repo.dirstate.parents() |
176 for node in repo.dirstate.parents() |
180 if node != nullid |
177 if node != repo.nullid |
181 ] |
178 ] |
182 |
179 |
183 allincludes = set() |
180 allincludes = set() |
184 allexcludes = set() |
181 allexcludes = set() |
185 allprofiles = set() |
182 allprofiles = set() |
319 |
316 |
320 if not revs or revs == [None]: |
317 if not revs or revs == [None]: |
321 revs = [ |
318 revs = [ |
322 repo.changelog.rev(node) |
319 repo.changelog.rev(node) |
323 for node in repo.dirstate.parents() |
320 for node in repo.dirstate.parents() |
324 if node != nullid |
321 if node != repo.nullid |
325 ] |
322 ] |
326 |
323 |
327 signature = configsignature(repo, includetemp=includetemp) |
324 signature = configsignature(repo, includetemp=includetemp) |
328 |
325 |
329 key = b'%s %s' % (signature, b' '.join(map(pycompat.bytestr, revs))) |
326 key = b'%s %s' % (signature, b' '.join(map(pycompat.bytestr, revs))) |