| 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
|