| Sun, 17 Jun 2018 22:13:41 -0700 |
Martin von Zweigbergk |
progress: hide update(None) in a new complete() method
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 22:37:01 -0700 |
Martin von Zweigbergk |
progress: create helper class for incrementing progress
|
file |
diff |
annotate
|
| Thu, 17 May 2018 15:25:52 -0700 |
Martin von Zweigbergk |
narrow: filter set of files to check for case-folding to core
|
file |
diff |
annotate
|
| Thu, 17 May 2018 15:12:48 -0700 |
Martin von Zweigbergk |
narrow: filter merge actions in core
|
file |
diff |
annotate
|
| Fri, 11 May 2018 00:54:37 -0400 |
Augie Fackler |
merge: drop support for using updateresults as tuples (API)
|
file |
diff |
annotate
|
| Sat, 14 Apr 2018 18:50:45 -0400 |
Matt Harbison |
scmutil: teach the file prefetch hook to handle multiple commits
|
file |
diff |
annotate
|
| Thu, 29 Mar 2018 21:29:15 -0700 |
Martin von Zweigbergk |
context: avoid using a context object as a changeid
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 00:30:00 -0500 |
Gregory Szorc |
merge: deprecate accessing update results by index
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 18:10:36 -0800 |
Gregory Szorc |
merge: use constants for actions
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 14:21:57 -0500 |
Gregory Szorc |
merge: use constants for merge record state
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 14:15:31 -0500 |
Gregory Szorc |
merge: use constants for merge driver state
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 14:09:23 -0500 |
Gregory Szorc |
merge: use constants for merge state record types
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 00:02:13 -0500 |
Gregory Szorc |
merge: return an attrs class from update() and applyupdates()
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 22:58:31 -0400 |
Matt Harbison |
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 22:56:29 -0400 |
Matt Harbison |
merge: pconvert paths in _unknowndirschecker before dirstate-normalizing
|
file |
diff |
annotate
|
| Fri, 02 Mar 2018 02:44:49 +0530 |
Pulkit Goyal |
py3: slice over bytes to prevent getting ascii values
|
file |
diff |
annotate
|
| Wed, 28 Feb 2018 21:44:28 +0530 |
Pulkit Goyal |
py3: make sure we write in mergestate in bytes mode
|
file |
diff |
annotate
|
| Sun, 18 Feb 2018 14:53:55 -0500 |
Augie Fackler |
merge: make a copy of dict.items() before mutating the dict during iteration
|
file |
diff |
annotate
|
| Tue, 13 Feb 2018 23:37:58 -0500 |
Augie Fackler |
merge: coerce nodes to bytes, not str
|
file |
diff |
annotate
|
| Sun, 11 Feb 2018 13:25:56 -0500 |
Matt Harbison |
merge: invoke scmutil.fileprefetchhooks() prior to applying updates
|
file |
diff |
annotate
|
| Sun, 11 Feb 2018 13:09:16 -0800 |
Gregory Szorc |
py3: use bytes() to cast context instances
|
file |
diff |
annotate
|
| Tue, 06 Feb 2018 22:55:02 +0900 |
Yuya Nishihara |
merge: cut import cycle at merge -> extensions
|
file |
diff |
annotate
|
| Tue, 06 Feb 2018 22:36:38 +0900 |
Yuya Nishihara |
subrepo: split non-core functions to new module
|
file |
diff |
annotate
|
| Wed, 17 Jan 2018 17:07:55 +0100 |
Boris Feld |
atomicupdate: add an experimental option to use atomictemp when updating
|
file |
diff |
annotate
|
| Wed, 27 Dec 2017 13:53:21 -0600 |
Phil Cohen |
merge: raise before running mergedriver if using IMM
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
merge: don't check for unknown files in IMM
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: remove calls to flushall()
|
file |
diff |
annotate
|
| Fri, 24 Nov 2017 12:53:58 -0800 |
Mark Thomas |
merge: check created file dirs for path conflicts only once (issue5716)
stable 4.4.2
|
file |
diff |
annotate
|
| Fri, 24 Nov 2017 12:53:58 -0800 |
Mark Thomas |
merge: cache unknown dir checks (issue5716)
stable
|
file |
diff |
annotate
|
| Tue, 24 Oct 2017 11:14:38 -0700 |
Siddharth Agarwal |
merge: add a config option to disable path conflict checking
stable
|
file |
diff |
annotate
|
| Wed, 04 Oct 2017 23:22:34 +0200 |
muxator |
update: mention long options explicitly in description of merge.update()
stable
|
file |
diff |
annotate
|
| Wed, 18 Oct 2017 22:57:15 +0200 |
Gregory Szorc |
fsmonitor: warn when fsmonitor could be used
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
context: add workingfilectx.markcopied
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
merge: don't use workers in in-memory mode
|
file |
diff |
annotate
|
| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: ensure that we always commit the mergestate
|
file |
diff |
annotate
|
| Thu, 05 Oct 2017 08:03:57 -0700 |
Mark Thomas |
merge: improve comments in mergestate._makerecords
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when merging (issue5628)
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: improve error messages for path conflicts during update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when updating (issue5628)
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: rename conflicts to fileconflicts in _checkunknownfiles
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add _checkunknowndirs function for detecting path conflicts
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: backup conflicting directories when getting files
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'pr' to rename files during update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'p' to record path conflicts during update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add pathconflict merge state
|
file |
diff |
annotate
|
| Sun, 08 Oct 2017 21:48:40 +0200 |
Boris Feld |
configitems: register 'merge.checkunknown' and 'merge.checkignored'
|
file |
diff |
annotate
|
| Fri, 29 Sep 2017 15:48:34 +0000 |
Alex Gaynor |
style: never use a space before a colon or comma
|
file |
diff |
annotate
|
| Fri, 30 Jun 2017 03:43:13 +0200 |
Boris Feld |
configitems: register the 'merge.preferancestor' config
|
file |
diff |
annotate
|
| Sat, 30 Sep 2017 15:48:08 +0530 |
Pulkit Goyal |
py3: use pycompat.bytestr instead of str
|
file |
diff |
annotate
|
| Sat, 30 Sep 2017 15:45:15 +0530 |
Pulkit Goyal |
py3: explicitly convert dict.keys() and dict.items() into a list
|
file |
diff |
annotate
|
| Thu, 14 Sep 2017 13:14:32 -0700 |
Phil Cohen |
merge: allow a custom working context to be passed to update
|
file |
diff |
annotate
|
| Tue, 12 Sep 2017 19:27:01 -0700 |
Phil Cohen |
merge: move cwd-missing detection to helper functions
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:17:43 -0700 |
Phil Cohen |
merge: flush any deferred writes just before recordupdates()
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: flush any deferred writes before, and after, running any workers
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: pass wctx to premerge, filemerge
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
merge: move some of the logic in batchget() to workingfilectx
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 19:27:28 +0000 |
Alex Gaynor |
merge: removed sorting in casefolding detection, for a slight performance win
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 14:22:40 -0700 |
Jun Wu |
codemod: register core configitems using a script
|
file |
diff |
annotate
|
| Thu, 06 Jul 2017 16:29:31 -0700 |
Gregory Szorc |
sparse: refactor update actions filtering and call from core
|
file |
diff |
annotate
|