| Thu, 09 Jul 2020 18:48:55 -0700 |
Rodrigo Damazio Bovendorp |
scmutil: allowing different files to be prefetched per revision
|
file |
diff |
annotate
|
| Wed, 24 Jun 2020 23:17:56 -0700 |
Martin von Zweigbergk |
merge: don't grab wlock when merging in memory
|
file |
diff |
annotate
|
| Fri, 05 Jun 2020 11:10:33 -0700 |
Martin von Zweigbergk |
merge: move an inspection of the dirstate from record to calculate phase
|
file |
diff |
annotate
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
file |
diff |
annotate
|
| Thu, 09 Apr 2020 16:06:03 +0530 |
Pulkit Goyal |
mergestate: store about files resolved in favour of other
|
file |
diff |
annotate
|
| Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
file |
diff |
annotate
|
| Wed, 26 Feb 2020 10:40:31 -0800 |
Martin von Zweigbergk |
merge: introduce a merge() for that use-case
|
file |
diff |
annotate
|
| Thu, 13 Feb 2020 17:15:08 -0800 |
Martin von Zweigbergk |
mergestate: determine if active without looking for state files on disk
|
file |
diff |
annotate
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
file |
diff |
annotate
|
| Sat, 08 Feb 2020 10:22:47 -0500 |
Valentin Gatien-Baron |
purge: add -i flag to delete ignored files instead of untracked files
|
file |
diff |
annotate
|
| Wed, 05 Feb 2020 17:12:39 -0500 |
Augie Fackler |
merge: use manifestdict.walk() instead of manifestdict.matches()
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 14:47:38 -0800 |
Martin von Zweigbergk |
merge: introduce a revert_to() for that use-case
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
file |
diff |
annotate
|
| Wed, 29 Jan 2020 11:30:16 -0800 |
Martin von Zweigbergk |
mergestate: add accessors for local and other nodeid, not just contexts
|
file |
diff |
annotate
|
| Tue, 28 Jan 2020 14:53:23 -0800 |
Martin von Zweigbergk |
graft: default `base` argument to common case of `ctx.p1()`
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 13:12:24 -0800 |
Martin von Zweigbergk |
graft: let caller pass in overlayworkingctx to merge.graft()
|
file |
diff |
annotate
|
| Thu, 23 Jan 2020 15:44:30 -0800 |
Martin von Zweigbergk |
merge: start using the per-side copy dicts
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 14:35:30 -0800 |
Martin von Zweigbergk |
copies: define a type to return from mergecopies()
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 16:45:56 -0800 |
Martin von Zweigbergk |
merge: move initialization of copy dicts to one place
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:12:50 -0800 |
Martin von Zweigbergk |
merge: avoid a negation in the definition of updatedirstate
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 08:32:35 -0800 |
Martin von Zweigbergk |
merge: move definition of `partial` closer to where it's used
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:08:42 -0800 |
Martin von Zweigbergk |
merge: define updatedirstate a little earlier and reuse it
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:07:43 -0800 |
Martin von Zweigbergk |
merge: don't call update hook when using in-memory context
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 13:47:59 -0800 |
Martin von Zweigbergk |
graftcopies: remove `skip` and `repo` arguments
|
file |
diff |
annotate
|
| Mon, 06 Jan 2020 15:24:36 -0800 |
Martin von Zweigbergk |
copies: replace duplicatecopies() by function that takes contexts
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 13:03:40 -0800 |
Martin von Zweigbergk |
graft: extract repo[None] to a variable
|
file |
diff |
annotate
|
| Mon, 13 Jan 2020 17:15:14 -0500 |
Augie Fackler |
core: migrate uses of hashlib.sha1 to hashutil.sha1
|
file |
diff |
annotate
|
| Thu, 05 Dec 2019 09:39:49 -0800 |
Martin von Zweigbergk |
graft: never set both parents equal in the dirstate (issue6098)
|
file |
diff |
annotate
|
| Thu, 05 Dec 2019 09:34:43 -0800 |
Martin von Zweigbergk |
graft: extract `repo['.']` to local variable
|
file |
diff |
annotate
|
| Thu, 05 Dec 2019 09:32:47 -0800 |
Martin von Zweigbergk |
graft: rename `pctx` argument to `base` since that's what it is
|
file |
diff |
annotate
|
| Sun, 01 Dec 2019 18:46:10 -0500 |
Matt Harbison |
cleanup: fix docstring formatting
|
file |
diff |
annotate
|
| Fri, 15 Nov 2019 15:36:09 -0800 |
Martin von Zweigbergk |
dirstate: include explicit matches in match.traversedir calls
|
file |
diff |
annotate
|
| Thu, 14 Nov 2019 08:03:26 -0800 |
Martin von Zweigbergk |
utils: move finddirs() to pathutil
|
file |
diff |
annotate
|
| Tue, 05 Nov 2019 08:42:42 -0800 |
Martin von Zweigbergk |
py3: don't use bytes with vars() or __dict__
stable
|
file |
diff |
annotate
|
| Tue, 08 Oct 2019 15:06:18 -0700 |
Martin von Zweigbergk |
cleanup: join string literals that are already on one line
|
file |
diff |
annotate
|
| Mon, 07 Oct 2019 00:04:04 -0400 |
Gregory Szorc |
py3: finish porting iteritems() to pycompat and remove source transformer
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 17:59:15 -0400 |
Gregory Szorc |
py3: define and use pycompat.itervalues()
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 16:58:55 -0400 |
Gregory Szorc |
py3: manually import pycompat.delattr where it is needed
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|
| Wed, 25 Sep 2019 11:04:08 -0400 |
Augie Fackler |
merge: check argument value with if/raise instead of an assert
|
file |
diff |
annotate
|
| Wed, 25 Sep 2019 10:53:10 -0400 |
Augie Fackler |
merge: replace magic strings with NAMED_CONSTANTS (API)
|
file |
diff |
annotate
|
| Mon, 23 Sep 2019 21:29:53 +0900 |
Yuya Nishihara |
merge with stable
|
file |
diff |
annotate
|
| Fri, 20 Sep 2019 23:31:03 +0700 |
Anton Shestakov |
merge: back out changeset a4ca0610c754 (parents order when grafting a merge)
stable 5.1.2
|
file |
diff |
annotate
|
| Thu, 19 Sep 2019 07:50:24 +0900 |
Yuya Nishihara |
merge with stable
|
file |
diff |
annotate
|
| Wed, 18 Sep 2019 17:53:10 +0700 |
Anton Shestakov |
merge: respect parents order when using `graft` on a merge, this time for real
stable
|
file |
diff |
annotate
|
| Mon, 09 Sep 2019 17:26:17 -0400 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 09 Sep 2019 17:32:21 +0200 |
Pierre-Yves David |
merge: respect parents order when using `graft` on a merge
stable
|
file |
diff |
annotate
|
| Wed, 21 Aug 2019 13:14:39 -0700 |
Martin von Zweigbergk |
merge: hint about using `hg resolve` for resolving conflicts
|
file |
diff |
annotate
|
| Thu, 27 Jun 2019 11:39:35 +0200 |
Valentin Gatien-Baron |
update: fix spurious unclean status bug shown by previous commit
|
file |
diff |
annotate
|
| Mon, 27 May 2019 16:55:46 -0400 |
Valentin Gatien-Baron |
merge: fix race that could cause wrong size in dirstate
|
file |
diff |
annotate
|
| Tue, 04 Jun 2019 17:24:35 +0800 |
Anton Shestakov |
merge: correct argument name in docstring
|
file |
diff |
annotate
|
| Sat, 09 Mar 2019 22:13:06 -0800 |
Martin von Zweigbergk |
merge: simplify initialization of "pas"
|
file |
diff |
annotate
|
| Sat, 09 Mar 2019 22:11:27 -0800 |
Martin von Zweigbergk |
merge: reorder some initialization to make more sense
|
file |
diff |
annotate
|
| Sun, 14 Apr 2019 00:46:25 -0700 |
Martin von Zweigbergk |
merge: remove workaround for issue5020
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
file |
diff |
annotate
|
| Wed, 03 Apr 2019 11:21:27 -0700 |
Martin von Zweigbergk |
cleanup: use set literals where possible
|
file |
diff |
annotate
|
| Sat, 30 Mar 2019 13:13:10 -0700 |
Martin von Zweigbergk |
merge: make "labels" argument to graft() optional, like it is for update()
|
file |
diff |
annotate
|
| Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:19:05 -0800 |
Martin von Zweigbergk |
merge: migrate to scmutil.backuppath()
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:23:44 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate absolute path
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:21:55 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate backup path
|
file |
diff |
annotate
|
| Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
file |
diff |
annotate
|
| Tue, 08 Jan 2019 14:19:51 -0800 |
Daniel Ploch |
merge: make local file storage in the .hg/merge directory extensible
|
file |
diff |
annotate
|
| Sun, 23 Dec 2018 13:16:25 +0530 |
Sushil khanchi |
merge: modify the logical statement
|
file |
diff |
annotate
|
| Fri, 21 Dec 2018 09:48:30 -0800 |
Martin von Zweigbergk |
merge: extract helper for creating empty "actions" dict
|
file |
diff |
annotate
|
| Fri, 21 Sep 2018 19:48:23 -0400 |
Matt Harbison |
py3: rename pycompat.getcwd() to encoding.getcwd() (API)
|
file |
diff |
annotate
|
| Tue, 04 Sep 2018 15:55:23 -0700 |
Gregory Szorc |
merge: use vfs methods for I/O
|
file |
diff |
annotate
|
| Thu, 06 Sep 2018 18:30:12 -0700 |
Gregory Szorc |
merge: move purge logic from extension
|
file |
diff |
annotate
|
| Fri, 27 Jul 2018 14:56:10 +0300 |
Pulkit Goyal |
merge: do the trivial resolution after updating sparse checkout
stable
|
file |
diff |
annotate
|
| Wed, 18 Jul 2018 09:49:34 -0700 |
Gregory Szorc |
merge: mark file gets as not thread safe (issue5933)
|
file |
diff |
annotate
|
| Tue, 29 May 2018 00:26:20 +0200 |
Boris Feld |
merge: add a 'keepconflictparent' argument to graft
|
file |
diff |
annotate
|
| Thu, 21 Jun 2018 09:32:31 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Tue, 19 Jun 2018 22:45:52 +0900 |
Yuya Nishihara |
merge: do not fill manifest of committed revision with pseudo node (issue5526)
stable
|
file |
diff |
annotate
|
| 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
|
| Thu, 06 Jul 2017 14:33:18 -0700 |
Gregory Szorc |
sparse: move pruning of temporary includes into core
|
file |
diff |
annotate
|
| Tue, 01 Dec 2015 09:26:33 -0800 |
Martin von Zweigbergk |
mergestate: implement unresolvedcount() in terms of unresolved()
|
file |
diff |
annotate
|
| Tue, 01 Dec 2015 09:26:10 -0800 |
Martin von Zweigbergk |
mergestate: make unresolved() use iteritems()
|
file |
diff |
annotate
|
| Tue, 04 Jul 2017 22:35:52 -0700 |
Phil Cohen |
workingfilectx: add exists, lexists
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 01:40:34 +0200 |
Pierre-Yves David |
obsutil: move 'foreground' to the new modules
|
file |
diff |
annotate
|
| Mon, 26 Jun 2017 17:20:46 +0530 |
Pulkit Goyal |
py3: use hex() to convert the hash to bytes
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 22:30:14 -0700 |
Phil Cohen |
workingfilectx: add audit() as a wrapper for wvfs.audit()
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 22:30:14 -0700 |
Phil Cohen |
workingfilectx: add backgroundclose as a kwarg to write()
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 22:29:09 -0700 |
Phil Cohen |
merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 17:00:15 -0700 |
Phil Cohen |
merge: convert repo.wwrite() calls to wctx[f].write()
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 16:58:26 -0700 |
Phil Cohen |
merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove()
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 16:56:49 -0700 |
Phil Cohen |
merge: pass wctx to batchremove and batchget
|
file |
diff |
annotate
|
| Fri, 16 Jun 2017 01:46:47 +0530 |
Pulkit Goyal |
py3: replace dict.iterkeys() with iter(dict)
|
file |
diff |
annotate
|
| Sat, 03 Jun 2017 19:01:19 +0900 |
Yuya Nishihara |
merge: use scmutil.intrev() to sort ctx objects
|
file |
diff |
annotate
|
| Thu, 01 Jun 2017 02:14:26 +0530 |
Pulkit Goyal |
py3: convert bool variables to bytes before passing into ui.debug()
|
file |
diff |
annotate
|
| Wed, 31 May 2017 23:48:52 +0530 |
Pulkit Goyal |
py3: replace None with -1 to sort an integer array
|
file |
diff |
annotate
|
| Fri, 12 May 2017 16:33:33 -0700 |
Martin von Zweigbergk |
merge: use intersectmatchers() in "m2-vs-ma optimization"
|
file |
diff |
annotate
|
| Thu, 18 May 2017 17:11:24 -0400 |
Augie Fackler |
merge: migrate to context manager for changing dirstate parents
|
file |
diff |
annotate
|
| Thu, 11 May 2017 18:38:43 -0700 |
Phil Cohen |
merge: use repo.wvfs.setflags() instead of util.setflags()
|
file |
diff |
annotate
|
| Wed, 03 May 2017 10:43:59 -0700 |
Durham Goode |
rebase: use matcher to optimize manifestmerge
|
file |
diff |
annotate
|
| Sun, 26 Mar 2017 16:55:56 -0700 |
Jun Wu |
merge: use ProgrammingError
|
file |
diff |
annotate
|
| Sun, 19 Mar 2017 11:42:17 -0700 |
Durham Goode |
merge: remove unnecessary matcher checks
|
file |
diff |
annotate
|
| Mon, 13 Mar 2017 21:58:43 -0700 |
Martin von Zweigbergk |
merge: also allow 'e' action with experimental.updatecheck=noconflict
|
file |
diff |
annotate
|
| Sun, 12 Mar 2017 16:41:46 -0700 |
Mads Kiilerich |
merge: check current wc branch for 'nothing to merge', not its p1
|
file |
diff |
annotate
|
| Wed, 08 Mar 2017 16:53:32 -0800 |
Pierre-Yves David |
merge: directly use repo.vfs.join
|
file |
diff |
annotate
|
| Wed, 14 Jan 2015 01:15:26 +0100 |
Mads Kiilerich |
merge: use repo.wvfs.unlinkpath
|
file |
diff |
annotate
|
| Wed, 14 Jan 2015 01:15:26 +0100 |
Mads Kiilerich |
vfs: use repo.wvfs.unlinkpath
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 18:38:20 -0800 |
Durham Goode |
merge: remove uses of manifest.matches
|
file |
diff |
annotate
|
| Mon, 06 Mar 2017 23:21:27 -0800 |
Martin von Zweigbergk |
update: for "noconflict" updates, print "conflicting changes" on conflict
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 00:05:55 -0800 |
Martin von Zweigbergk |
update: allow setting default update check to "noconflict"
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 12:58:37 -0800 |
Martin von Zweigbergk |
update: accept --merge to allow merging across topo branches (issue5125)
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:09:19 -0800 |
Martin von Zweigbergk |
merge: combine the "merge" cases in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:07:01 -0800 |
Martin von Zweigbergk |
merge: combine "dirty" cases in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:29:34 -0800 |
Martin von Zweigbergk |
merge: clarify non-linear default updates in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:02:36 -0800 |
Martin von Zweigbergk |
merge: combine the two "can't happen" cases in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:00:13 -0800 |
Martin von Zweigbergk |
merge: move "incompatible options" case first in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 14:58:53 -0800 |
Martin von Zweigbergk |
merge: make "linear" an input in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 14:33:17 -0800 |
Martin von Zweigbergk |
merge: drop redundant column in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 14:27:22 -0800 |
Martin von Zweigbergk |
merge: drop obsolete non-linear cases from docstring table
|
file |
diff |
annotate
|
| Thu, 09 Feb 2017 09:52:32 -0800 |
Martin von Zweigbergk |
destutil: remove duplicate check and leave it to merge.update()
|
file |
diff |
annotate
|
| Thu, 09 Feb 2017 09:55:31 -0800 |
Martin von Zweigbergk |
update: fix typo/stale comment to match code
|
file |
diff |
annotate
|
| Wed, 08 Feb 2017 23:03:33 -0800 |
Martin von Zweigbergk |
merge: remove unused handling of default destination in merge.update()
|
file |
diff |
annotate
|
| Wed, 08 Feb 2017 14:49:37 -0800 |
Martin von Zweigbergk |
update: localize logic around which ancestor to use
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 02:10:30 +0100 |
Mads Kiilerich |
merge: more safe detection of criss cross merge conflict between dm and r
stable
|
file |
diff |
annotate
|
| Tue, 31 Jan 2017 03:25:59 +0100 |
Mads Kiilerich |
merge: fix crash on criss cross merge with dir move and delete (issue5020)
stable
|
file |
diff |
annotate
|
| Mon, 05 Dec 2016 17:40:01 +0100 |
Gábor Stefanik |
graft: support grafting changes to new file in renamed directory (issue5436)
|
file |
diff |
annotate
|
| Wed, 23 Nov 2016 00:03:11 +0530 |
Pulkit Goyal |
py3: use pycompat.getcwd() instead of os.getcwd()
|
file |
diff |
annotate
|
| Mon, 21 Nov 2016 21:52:19 -0500 |
Augie Fackler |
mergemod: drop support for merge.update without a target
|
file |
diff |
annotate
|
| Thu, 10 Nov 2016 02:21:15 -0800 |
Durham Goode |
merge: change modified indicator to be 20 bytes
|
file |
diff |
annotate
|
| Thu, 10 Nov 2016 02:19:16 -0800 |
Durham Goode |
dirstate: change added/modified placeholder hash length to 20 bytes
|
file |
diff |
annotate
|
| Mon, 17 Oct 2016 23:16:55 +0200 |
Mads Kiilerich |
spelling: fixes of non-dictionary words
|
file |
diff |
annotate
|
| Thu, 25 Aug 2016 22:02:26 +0200 |
Gábor Stefanik |
update: enable copy tracing for backwards and non-linear updates
|
file |
diff |
annotate
|
| Tue, 04 Oct 2016 04:06:48 -0700 |
Stanislau Hlebik |
update: warn if cwd was deleted
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 12:22:18 +0200 |
Mads Kiilerich |
merge: clarify warning for (not) merging flags without ancestor
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 12:22:18 +0200 |
Mads Kiilerich |
merge: only show "cannot merge flags for %s" warning if flags are different
|
file |
diff |
annotate
|
| Sun, 02 Oct 2016 17:31:32 +0900 |
Yuya Nishihara |
merge: update doc of manifestmerge() per 18c2184c27dc
|
file |
diff |
annotate
|
| Sat, 08 Oct 2016 01:25:28 -0700 |
Simon Farnsworth |
merge: use labels in subrepo merge
|
file |
diff |
annotate
|
| Tue, 30 Aug 2016 09:22:53 -0700 |
Martin von Zweigbergk |
util: rename checkcase() to fscasesensitive() (API)
|
file |
diff |
annotate
|
| Tue, 23 Aug 2016 17:58:53 -0700 |
Siddharth Agarwal |
merge: remove files with extra actions from merge action list
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
file |
diff |
annotate
|
| Thu, 21 Jul 2016 15:55:47 -0700 |
Kostia Balytskyi |
update: fix bug when update tries to modify folder symlink
stable
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 17:42:55 +0200 |
Kostia Balytskyi |
update: teach hg to override untracked dir with a tracked file on update
|
file |
diff |
annotate
|
| Fri, 10 Jun 2016 00:12:33 -0400 |
Augie Fackler |
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
|
file |
diff |
annotate
|
| Thu, 26 May 2016 01:57:34 +0900 |
FUJIWARA Katsunori |
merge: make messages translatable
|
file |
diff |
annotate
|
| Mon, 16 May 2016 21:30:53 +0000 |
timeless |
py3: convert to next() function
|
file |
diff |
annotate
|
| Wed, 11 May 2016 09:31:47 +0200 |
Pierre-Yves David |
devel: officially deprecate update without destination
|
file |
diff |
annotate
|
| Sun, 08 May 2016 10:43:41 +0200 |
Pierre-Yves David |
devel: use the new 'config' argument for the update develwarn
|
file |
diff |
annotate
|
| Sat, 19 Mar 2016 18:37:10 -0700 |
Simon Farnsworth |
merge: save merge part labels for later reuse
|
file |
diff |
annotate
|
| Fri, 26 Feb 2016 19:13:10 +0000 |
Simon Farnsworth |
merge: fix error message
|
file |
diff |
annotate
|
| Tue, 23 Feb 2016 10:59:25 -0800 |
Martin von Zweigbergk |
merge: use any() instead of for loop when checking for dirty subrepos
|
file |
diff |
annotate
|
| Sat, 20 Feb 2016 15:54:09 -0800 |
Gregory Szorc |
merge: perform background file closing in batchget
|
file |
diff |
annotate
|
| Sat, 20 Feb 2016 15:27:11 -0800 |
Gregory Szorc |
merge: indent code in batchget()
|
file |
diff |
annotate
|
| Thu, 11 Feb 2016 17:23:10 -0800 |
Durham Goode |
checkunknown: audit path before checking if it's a file or link
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 13:12:06 -0800 |
Siddharth Agarwal |
rebase: respect checkunknown and checkignored in more cases
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 20:28:32 -0800 |
Siddharth Agarwal |
merge: tell _checkunknownfiles about whether this was merge --force
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 20:28:32 -0800 |
Siddharth Agarwal |
merge: add missing doc for 'labels' parameter
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 20:28:32 -0800 |
Siddharth Agarwal |
merge: move abort/warn checks up to the top level of _checkunknownfiles
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:15:28 -0800 |
Durham Goode |
merge: add state extras merge state data
|
file |
diff |
annotate
|
| Fri, 29 Jan 2016 14:19:29 -0800 |
Siddharth Agarwal |
merge: don't try to merge subrepos twice (issue4988)
stable
|
file |
diff |
annotate
|
| Fri, 15 Jan 2016 13:14:49 -0800 |
Bryan O'Sullivan |
with: use context manager in merge update
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 18:38:49 -0800 |
Siddharth Agarwal |
merge: split up checks for unknown and ignored files that differ
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 18:17:07 -0800 |
Siddharth Agarwal |
merge: determine what untracked conflicts cause warns and aborts separately
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 18:12:35 -0800 |
Siddharth Agarwal |
merge: factor out code to get checkunknown config
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:11:52 -0800 |
Siddharth Agarwal |
merge: add options to warn or ignore on colliding unknown files
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:21:01 -0800 |
Siddharth Agarwal |
batchget: add support for backing up files
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
merge: add a new 'backup' argument to get actions
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
_checkunknownfiles: turn 'conflicts' into a set
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
checkunknownfiles: make control flow clearer
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
_checkunknownfiles: rename 'aborts' to 'conflicts'
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 02:13:56 +0100 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 28 Dec 2015 22:51:37 -0800 |
Siddharth Agarwal |
merge: while checking for unknown files don't follow symlinks (issue5027)
stable
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 20:57:21 -0500 |
Augie Fackler |
manifestmerge: have manifest do matching before diffing
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 20:47:22 -0500 |
Augie Fackler |
merge: rework manifestmerge to use a matcher
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 20:37:41 -0500 |
Augie Fackler |
merge: restate calculateupdates in terms of a matcher
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 18:54:03 -0500 |
Augie Fackler |
merge: have merge.update use a matcher instead of partial fn
|
file |
diff |
annotate
|
| Mon, 07 Dec 2015 20:43:24 -0800 |
Martin von Zweigbergk |
merge: refuse update/merge if there are unresolved conflicts (BC)
|
file |
diff |
annotate
|
| Thu, 03 Dec 2015 23:01:59 -0500 |
Andrew Halberstadt |
merge.graft: add option to keep second parent
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
file |
diff |
annotate
|
| Tue, 24 Nov 2015 15:26:51 -0800 |
Siddharth Agarwal |
merge.recordupdates: mark 'a' files as added unconditionally
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:19:39 -0800 |
Siddharth Agarwal |
merge: add a new action type representing files to add/mark as modified
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:03:21 -0800 |
Siddharth Agarwal |
mergestate: add a cached property accessor for the local context
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:05:09 -0800 |
Siddharth Agarwal |
mergestate: raise exception if otherctx is accessed but _other isn't set
|
file |
diff |
annotate
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
file |
diff |
annotate
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
file |
diff |
annotate
|