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
|
Thu, 19 Sep 2019 07:50:24 +0900 |
Yuya Nishihara |
merge with stable
|
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
|
Mon, 09 Sep 2019 17:26:17 -0400 |
Augie Fackler |
merge with stable
|
Mon, 09 Sep 2019 17:32:21 +0200 |
Pierre-Yves David |
merge: respect parents order when using `graft` on a merge
stable
|
Wed, 21 Aug 2019 13:14:39 -0700 |
Martin von Zweigbergk |
merge: hint about using `hg resolve` for resolving conflicts
|
Thu, 27 Jun 2019 11:39:35 +0200 |
Valentin Gatien-Baron |
update: fix spurious unclean status bug shown by previous commit
|
Mon, 27 May 2019 16:55:46 -0400 |
Valentin Gatien-Baron |
merge: fix race that could cause wrong size in dirstate
|
Tue, 04 Jun 2019 17:24:35 +0800 |
Anton Shestakov |
merge: correct argument name in docstring
|
Sat, 09 Mar 2019 22:13:06 -0800 |
Martin von Zweigbergk |
merge: simplify initialization of "pas"
|
Sat, 09 Mar 2019 22:11:27 -0800 |
Martin von Zweigbergk |
merge: reorder some initialization to make more sense
|
Sun, 14 Apr 2019 00:46:25 -0700 |
Martin von Zweigbergk |
merge: remove workaround for issue5020
|
Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
Wed, 03 Apr 2019 11:21:27 -0700 |
Martin von Zweigbergk |
cleanup: use set literals where possible
|
Sat, 30 Mar 2019 13:13:10 -0700 |
Martin von Zweigbergk |
merge: make "labels" argument to graft() optional, like it is for update()
|
Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
Mon, 04 Feb 2019 21:19:05 -0800 |
Martin von Zweigbergk |
merge: migrate to scmutil.backuppath()
|
Mon, 04 Feb 2019 21:23:44 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate absolute path
|
Mon, 04 Feb 2019 21:21:55 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate backup path
|
Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
Tue, 08 Jan 2019 14:19:51 -0800 |
Daniel Ploch |
merge: make local file storage in the .hg/merge directory extensible
|
Sun, 23 Dec 2018 13:16:25 +0530 |
Sushil khanchi |
merge: modify the logical statement
|
Fri, 21 Dec 2018 09:48:30 -0800 |
Martin von Zweigbergk |
merge: extract helper for creating empty "actions" dict
|
Fri, 21 Sep 2018 19:48:23 -0400 |
Matt Harbison |
py3: rename pycompat.getcwd() to encoding.getcwd() (API)
|
Tue, 04 Sep 2018 15:55:23 -0700 |
Gregory Szorc |
merge: use vfs methods for I/O
|
Thu, 06 Sep 2018 18:30:12 -0700 |
Gregory Szorc |
merge: move purge logic from extension
|
Fri, 27 Jul 2018 14:56:10 +0300 |
Pulkit Goyal |
merge: do the trivial resolution after updating sparse checkout
stable
|
Wed, 18 Jul 2018 09:49:34 -0700 |
Gregory Szorc |
merge: mark file gets as not thread safe (issue5933)
|
Tue, 29 May 2018 00:26:20 +0200 |
Boris Feld |
merge: add a 'keepconflictparent' argument to graft
|
Thu, 21 Jun 2018 09:32:31 -0700 |
Martin von Zweigbergk |
merge with stable
|
Tue, 19 Jun 2018 22:45:52 +0900 |
Yuya Nishihara |
merge: do not fill manifest of committed revision with pseudo node (issue5526)
stable
|
Sun, 17 Jun 2018 22:13:41 -0700 |
Martin von Zweigbergk |
progress: hide update(None) in a new complete() method
|
Fri, 15 Jun 2018 22:37:01 -0700 |
Martin von Zweigbergk |
progress: create helper class for incrementing progress
|
Thu, 17 May 2018 15:25:52 -0700 |
Martin von Zweigbergk |
narrow: filter set of files to check for case-folding to core
|
Thu, 17 May 2018 15:12:48 -0700 |
Martin von Zweigbergk |
narrow: filter merge actions in core
|
Fri, 11 May 2018 00:54:37 -0400 |
Augie Fackler |
merge: drop support for using updateresults as tuples (API)
|
Sat, 14 Apr 2018 18:50:45 -0400 |
Matt Harbison |
scmutil: teach the file prefetch hook to handle multiple commits
|
Thu, 29 Mar 2018 21:29:15 -0700 |
Martin von Zweigbergk |
context: avoid using a context object as a changeid
|
Mon, 05 Mar 2018 00:30:00 -0500 |
Gregory Szorc |
merge: deprecate accessing update results by index
|
Mon, 05 Mar 2018 18:10:36 -0800 |
Gregory Szorc |
merge: use constants for actions
|
Mon, 05 Mar 2018 14:21:57 -0500 |
Gregory Szorc |
merge: use constants for merge record state
|
Mon, 05 Mar 2018 14:15:31 -0500 |
Gregory Szorc |
merge: use constants for merge driver state
|
Mon, 05 Mar 2018 14:09:23 -0500 |
Gregory Szorc |
merge: use constants for merge state record types
|
Mon, 05 Mar 2018 00:02:13 -0500 |
Gregory Szorc |
merge: return an attrs class from update() and applyupdates()
|
Thu, 22 Mar 2018 22:58:31 -0400 |
Matt Harbison |
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
|
Thu, 22 Mar 2018 22:56:29 -0400 |
Matt Harbison |
merge: pconvert paths in _unknowndirschecker before dirstate-normalizing
|
Fri, 02 Mar 2018 02:44:49 +0530 |
Pulkit Goyal |
py3: slice over bytes to prevent getting ascii values
|
Wed, 28 Feb 2018 21:44:28 +0530 |
Pulkit Goyal |
py3: make sure we write in mergestate in bytes mode
|
Sun, 18 Feb 2018 14:53:55 -0500 |
Augie Fackler |
merge: make a copy of dict.items() before mutating the dict during iteration
|
Tue, 13 Feb 2018 23:37:58 -0500 |
Augie Fackler |
merge: coerce nodes to bytes, not str
|
Sun, 11 Feb 2018 13:25:56 -0500 |
Matt Harbison |
merge: invoke scmutil.fileprefetchhooks() prior to applying updates
|
Sun, 11 Feb 2018 13:09:16 -0800 |
Gregory Szorc |
py3: use bytes() to cast context instances
|
Tue, 06 Feb 2018 22:55:02 +0900 |
Yuya Nishihara |
merge: cut import cycle at merge -> extensions
|
Tue, 06 Feb 2018 22:36:38 +0900 |
Yuya Nishihara |
subrepo: split non-core functions to new module
|
Wed, 17 Jan 2018 17:07:55 +0100 |
Boris Feld |
atomicupdate: add an experimental option to use atomictemp when updating
|
Wed, 27 Dec 2017 13:53:21 -0600 |
Phil Cohen |
merge: raise before running mergedriver if using IMM
|
Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
merge: don't check for unknown files in IMM
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
|
Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: remove calls to flushall()
|
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
|
Fri, 24 Nov 2017 12:53:58 -0800 |
Mark Thomas |
merge: cache unknown dir checks (issue5716)
stable
|
Tue, 24 Oct 2017 11:14:38 -0700 |
Siddharth Agarwal |
merge: add a config option to disable path conflict checking
stable
|
Wed, 04 Oct 2017 23:22:34 +0200 |
muxator |
update: mention long options explicitly in description of merge.update()
stable
|
Wed, 18 Oct 2017 22:57:15 +0200 |
Gregory Szorc |
fsmonitor: warn when fsmonitor could be used
|
Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
context: add workingfilectx.markcopied
|
Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
merge: don't use workers in in-memory mode
|
Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: ensure that we always commit the mergestate
|
Thu, 05 Oct 2017 08:03:57 -0700 |
Mark Thomas |
merge: improve comments in mergestate._makerecords
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when merging (issue5628)
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: improve error messages for path conflicts during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when updating (issue5628)
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: rename conflicts to fileconflicts in _checkunknownfiles
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add _checkunknowndirs function for detecting path conflicts
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: backup conflicting directories when getting files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'pr' to rename files during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'p' to record path conflicts during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add pathconflict merge state
|
Sun, 08 Oct 2017 21:48:40 +0200 |
Boris Feld |
configitems: register 'merge.checkunknown' and 'merge.checkignored'
|
Fri, 29 Sep 2017 15:48:34 +0000 |
Alex Gaynor |
style: never use a space before a colon or comma
|
Fri, 30 Jun 2017 03:43:13 +0200 |
Boris Feld |
configitems: register the 'merge.preferancestor' config
|
Sat, 30 Sep 2017 15:48:08 +0530 |
Pulkit Goyal |
py3: use pycompat.bytestr instead of str
|
Sat, 30 Sep 2017 15:45:15 +0530 |
Pulkit Goyal |
py3: explicitly convert dict.keys() and dict.items() into a list
|
Thu, 14 Sep 2017 13:14:32 -0700 |
Phil Cohen |
merge: allow a custom working context to be passed to update
|
Tue, 12 Sep 2017 19:27:01 -0700 |
Phil Cohen |
merge: move cwd-missing detection to helper functions
|
Mon, 11 Sep 2017 13:17:43 -0700 |
Phil Cohen |
merge: flush any deferred writes just before recordupdates()
|
Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: flush any deferred writes before, and after, running any workers
|
Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: pass wctx to premerge, filemerge
|
Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
merge: move some of the logic in batchget() to workingfilectx
|
Fri, 14 Jul 2017 19:27:28 +0000 |
Alex Gaynor |
merge: removed sorting in casefolding detection, for a slight performance win
|
Fri, 14 Jul 2017 14:22:40 -0700 |
Jun Wu |
codemod: register core configitems using a script
|
Thu, 06 Jul 2017 16:29:31 -0700 |
Gregory Szorc |
sparse: refactor update actions filtering and call from core
|
Thu, 06 Jul 2017 14:33:18 -0700 |
Gregory Szorc |
sparse: move pruning of temporary includes into core
|
Tue, 01 Dec 2015 09:26:33 -0800 |
Martin von Zweigbergk |
mergestate: implement unresolvedcount() in terms of unresolved()
|
Tue, 01 Dec 2015 09:26:10 -0800 |
Martin von Zweigbergk |
mergestate: make unresolved() use iteritems()
|
Tue, 04 Jul 2017 22:35:52 -0700 |
Phil Cohen |
workingfilectx: add exists, lexists
|
Tue, 27 Jun 2017 01:40:34 +0200 |
Pierre-Yves David |
obsutil: move 'foreground' to the new modules
|
Mon, 26 Jun 2017 17:20:46 +0530 |
Pulkit Goyal |
py3: use hex() to convert the hash to bytes
|
Sun, 25 Jun 2017 22:30:14 -0700 |
Phil Cohen |
workingfilectx: add audit() as a wrapper for wvfs.audit()
|
Sun, 25 Jun 2017 22:30:14 -0700 |
Phil Cohen |
workingfilectx: add backgroundclose as a kwarg to write()
|
Sun, 25 Jun 2017 22:29:09 -0700 |
Phil Cohen |
merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function
|
Sun, 25 Jun 2017 17:00:15 -0700 |
Phil Cohen |
merge: convert repo.wwrite() calls to wctx[f].write()
|
Sun, 25 Jun 2017 16:58:26 -0700 |
Phil Cohen |
merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove()
|
Sun, 25 Jun 2017 16:56:49 -0700 |
Phil Cohen |
merge: pass wctx to batchremove and batchget
|
Fri, 16 Jun 2017 01:46:47 +0530 |
Pulkit Goyal |
py3: replace dict.iterkeys() with iter(dict)
|
Sat, 03 Jun 2017 19:01:19 +0900 |
Yuya Nishihara |
merge: use scmutil.intrev() to sort ctx objects
|
Thu, 01 Jun 2017 02:14:26 +0530 |
Pulkit Goyal |
py3: convert bool variables to bytes before passing into ui.debug()
|
Wed, 31 May 2017 23:48:52 +0530 |
Pulkit Goyal |
py3: replace None with -1 to sort an integer array
|
Fri, 12 May 2017 16:33:33 -0700 |
Martin von Zweigbergk |
merge: use intersectmatchers() in "m2-vs-ma optimization"
|
Thu, 18 May 2017 17:11:24 -0400 |
Augie Fackler |
merge: migrate to context manager for changing dirstate parents
|
Thu, 11 May 2017 18:38:43 -0700 |
Phil Cohen |
merge: use repo.wvfs.setflags() instead of util.setflags()
|
Wed, 03 May 2017 10:43:59 -0700 |
Durham Goode |
rebase: use matcher to optimize manifestmerge
|
Sun, 26 Mar 2017 16:55:56 -0700 |
Jun Wu |
merge: use ProgrammingError
|
Sun, 19 Mar 2017 11:42:17 -0700 |
Durham Goode |
merge: remove unnecessary matcher checks
|
Mon, 13 Mar 2017 21:58:43 -0700 |
Martin von Zweigbergk |
merge: also allow 'e' action with experimental.updatecheck=noconflict
|
Sun, 12 Mar 2017 16:41:46 -0700 |
Mads Kiilerich |
merge: check current wc branch for 'nothing to merge', not its p1
|
Wed, 08 Mar 2017 16:53:32 -0800 |
Pierre-Yves David |
merge: directly use repo.vfs.join
|
Wed, 14 Jan 2015 01:15:26 +0100 |
Mads Kiilerich |
merge: use repo.wvfs.unlinkpath
|
Wed, 14 Jan 2015 01:15:26 +0100 |
Mads Kiilerich |
vfs: use repo.wvfs.unlinkpath
|
Tue, 07 Mar 2017 18:38:20 -0800 |
Durham Goode |
merge: remove uses of manifest.matches
|
Mon, 06 Mar 2017 23:21:27 -0800 |
Martin von Zweigbergk |
update: for "noconflict" updates, print "conflicting changes" on conflict
|