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