| Mon, 22 Dec 2014 17:26:21 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 22:51:29 -0800 |
Martin von Zweigbergk |
largefiles: don't duplicate 'actions' into 'actionbyfile'
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 22:07:41 -0800 |
Martin von Zweigbergk |
merge: make calculateupdates() return file->action dict
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 12:19:33 -0800 |
Pierre-Yves David |
largefile: explain why no monkey patching on a repoview
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 12:10:16 -0800 |
Pierre-Yves David |
largefile: backout ca54fb3d71ce
|
file |
diff |
annotate
|
| Sun, 21 Dec 2014 15:06:54 -0500 |
Matt Harbison |
largefiles: fix a spurious missing file warning with forget (issue4053)
stable
|
file |
diff |
annotate
|
| Sun, 21 Dec 2014 15:04:13 -0500 |
Matt Harbison |
largefiles: fix a spurious missing file warning with 'remove -A' (issue4053)
stable
|
file |
diff |
annotate
|
| Sun, 21 Dec 2014 14:42:46 -0500 |
Matt Harbison |
largefiles: introduce the 'composelargefilematcher()' method
stable
|
file |
diff |
annotate
|
| Thu, 18 Dec 2014 16:41:59 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 13 Dec 2014 13:33:48 -0500 |
Matt Harbison |
largefiles: don't actually remove largefiles in an addremove dry run
stable
|
file |
diff |
annotate
|
| Sat, 13 Dec 2014 14:53:46 -0500 |
Matt Harbison |
subrepo: drop the 'ui' parameter to archive()
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 21:21:21 -0800 |
Martin von Zweigbergk |
merge: move cd/dc prompts after largefiles prompts
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 22:27:49 -0500 |
Matt Harbison |
commit: propagate --addremove to subrepos if -S is specified (issue3759)
|
file |
diff |
annotate
|
| Sun, 09 Nov 2014 19:57:02 -0500 |
Matt Harbison |
scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 22:10:51 -0800 |
Martin von Zweigbergk |
largefiles: start by finding files of interest
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 22:03:53 -0800 |
Martin von Zweigbergk |
largefiles: rewrite merge code using dictionary with entry per file
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 09:53:26 -0800 |
Martin von Zweigbergk |
largefiles: put same 'action' object back in 'newglist'
|
file |
diff |
annotate
|
| Mon, 08 Dec 2014 15:20:42 -0800 |
Martin von Zweigbergk |
largefiles: don't unnecessarily sort merge action lists
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 16:49:55 -0800 |
Martin von Zweigbergk |
merge: don't treat 'diverge' and 'renamedelete' like actions
|
file |
diff |
annotate
|
| Sun, 07 Dec 2014 10:54:29 -0500 |
Matt Harbison |
largefiles: drop the unfiltered repo usage in overridepurge()
|
file |
diff |
annotate
|
| Fri, 05 Dec 2014 16:45:52 -0800 |
Martin von Zweigbergk |
largefiles: don't use 'r' action for standin that doesn't exist
|
file |
diff |
annotate
|
| Fri, 05 Dec 2014 16:51:37 -0800 |
Martin von Zweigbergk |
largefiles: don't use 'r' action for normal file that doesn't exist
|
file |
diff |
annotate
|
| Fri, 05 Dec 2014 10:53:25 -0800 |
Martin von Zweigbergk |
largefiles: remove redundant checks for false modify/delete conflicts
|
file |
diff |
annotate
|
| Fri, 21 Nov 2014 13:02:45 -0800 |
Martin von Zweigbergk |
largefiles: use clearer debug messages in actions
|
file |
diff |
annotate
|
| Fri, 21 Nov 2014 11:44:57 -0800 |
Martin von Zweigbergk |
largefiles: don't clobber merge action message with user message
|
file |
diff |
annotate
|
| Sun, 30 Nov 2014 23:30:31 -0500 |
Matt Harbison |
largefiles: drop the override for 'fetch'
|
file |
diff |
annotate
|
| Fri, 21 Nov 2014 22:24:45 -0500 |
Matt Harbison |
largefiles: split the creation of a normal matcher out of its install method
|
file |
diff |
annotate
|
| Mon, 01 Dec 2014 19:34:11 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 01 Dec 2014 02:11:29 +0100 |
Mads Kiilerich |
largefiles: don't show largefile/normal prompts if one side is unchanged
stable
|
file |
diff |
annotate
|
| Thu, 13 Nov 2014 23:12:15 -0800 |
Martin von Zweigbergk |
merge: drop underscore prefix from _checkunknown()
|
file |
diff |
annotate
|
| Fri, 14 Nov 2014 05:58:59 -0800 |
Martin von Zweigbergk |
largefiles: update comments to refer to the right overridden method
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 00:48:41 +0900 |
FUJIWARA Katsunori |
largefiles: move "copyalltostore" invocation into "markcommitted"
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 00:48:41 +0900 |
FUJIWARA Katsunori |
largefiles: avoid printing messages while transplanting by "_lfstatuswriters"
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 00:48:41 +0900 |
FUJIWARA Katsunori |
largefiles: update standins only at the 1st commit of "transplant --continue"
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 00:48:38 +0900 |
FUJIWARA Katsunori |
largefiles: avoid redundant "updatelfiles" invocation in "overridetransplant"
|
file |
diff |
annotate
|
| Wed, 05 Nov 2014 23:24:47 +0900 |
FUJIWARA Katsunori |
largefiles: avoid printing messages while rebasing by "_lfstatuswriters"
|
file |
diff |
annotate
|
| Wed, 05 Nov 2014 23:24:47 +0900 |
FUJIWARA Katsunori |
largefiles: get function to write status messages via "getstatuswriter()"
|
file |
diff |
annotate
|
| Wed, 05 Nov 2014 23:24:47 +0900 |
FUJIWARA Katsunori |
largefiles: update standins only at the 1st commit of "hg rebase --continue"
|
file |
diff |
annotate
|
| Wed, 05 Nov 2014 23:24:47 +0900 |
FUJIWARA Katsunori |
largefiles: remove meaningless code path for "hg pull --rebase"
|
file |
diff |
annotate
|
| Mon, 27 Oct 2014 21:10:24 -0700 |
Martin von Zweigbergk |
largefiles: remove confusing 'or None' from predicate
|
file |
diff |
annotate
|
| Thu, 30 Oct 2014 22:32:39 -0700 |
Martin von Zweigbergk |
largefiles: drop unnecessary setting of matcher._always
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
file |
diff |
annotate
|
| Wed, 15 Oct 2014 05:08:56 +0200 |
Mads Kiilerich |
largefiles: move initialization of standins variable to clarify its "scope"
|
file |
diff |
annotate
|
| Wed, 15 Oct 2014 05:08:56 +0200 |
Mads Kiilerich |
largefiles: the update override only needs lfdirstate and status for --check
|
file |
diff |
annotate
|
| Fri, 03 Oct 2014 00:42:40 +0200 |
Mads Kiilerich |
largefiles: remove confusing rev parameter for lfdirstatestatus
|
file |
diff |
annotate
|
| Fri, 03 Oct 2014 00:42:40 +0200 |
Mads Kiilerich |
largefiles: replace repo._isaddremove hack with a simple function parameter
|
file |
diff |
annotate
|
| Fri, 03 Oct 2014 22:10:08 -0700 |
Martin von Zweigbergk |
largefiles: access status fields by name rather than index
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 00:52:27 -0500 |
Martin von Zweigbergk |
status: update various other methods to return new class
|
file |
diff |
annotate
|
| Fri, 03 Oct 2014 21:44:10 -0700 |
Martin von Zweigbergk |
dirstate: separate 'lookup' status field from others
|
file |
diff |
annotate
|
| Tue, 30 Sep 2014 14:32:49 -0700 |
Martin von Zweigbergk |
largefiles: remove 'forget' list that's always empty
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: update largefiles even if transplant is aborted by conflict
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: update largefiles even if rebase is aborted by conflict
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: unlink standins not known to the restored dirstate at rollback
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:25 +0900 |
FUJIWARA Katsunori |
largefiles: restore standins according to restored dirstate
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:25 +0900 |
FUJIWARA Katsunori |
largefiles: restore standins from non branch-tip parent at rollback correctly
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:25 +0900 |
FUJIWARA Katsunori |
largefiles: omit restoring standins if working parent is not rollbacked
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: keep largefiles from colliding with normal one during linear merge
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: put whole "hgmerge" process into the same "wlock" scope
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: put whole "hgupdaterepo" process into the same "wlock" scope
|
file |
diff |
annotate
|
| Thu, 14 Aug 2014 16:25:47 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 13 Aug 2014 15:51:33 -0700 |
Siddharth Agarwal |
largefiles: don't override matchandpats for always matchers (issue4334)
stable
|
file |
diff |
annotate
|
| Wed, 13 Aug 2014 15:18:41 -0700 |
Siddharth Agarwal |
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
stable
|
file |
diff |
annotate
|
| Wed, 13 Aug 2014 15:13:50 -0700 |
Siddharth Agarwal |
largefiles: drop setting lfstatus in overridelog (issue4334)
stable
|
file |
diff |
annotate
|
| Mon, 11 Aug 2014 22:29:43 +0900 |
FUJIWARA Katsunori |
largefiles: drop orphan entries from lfdristat at "hg rollback"
|
file |
diff |
annotate
|
| Mon, 11 Aug 2014 22:29:43 +0900 |
FUJIWARA Katsunori |
largefiles: restore R status of removed largefiles correctly at "hg rollback"
|
file |
diff |
annotate
|
| Mon, 11 Aug 2014 22:29:43 +0900 |
FUJIWARA Katsunori |
largefiles: put whole rollback-ing process into the same "wlock" scope
|
file |
diff |
annotate
|
| Wed, 23 Jul 2014 00:10:24 +0900 |
FUJIWARA Katsunori |
largefiles: use "normallookup" on "lfdirstate" while reverting
stable
|
file |
diff |
annotate
|
| Mon, 07 Jul 2014 18:45:46 +0900 |
FUJIWARA Katsunori |
largefiles: confirm existence of outgoing largefile entities in remote store
|
file |
diff |
annotate
|
| Mon, 07 Jul 2014 18:45:46 +0900 |
FUJIWARA Katsunori |
largefiles: show also how many data entities are outgoing at "hg outgoing"
|
file |
diff |
annotate
|
| Mon, 07 Jul 2014 18:45:46 +0900 |
FUJIWARA Katsunori |
largefiles: show also how many data entities are outgoing at "hg summary"
|
file |
diff |
annotate
|
| Fri, 28 Feb 2014 02:25:58 +0100 |
Mads Kiilerich |
merge: use separate lists for each action type
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:54:23 -0700 |
Durham Goode |
merge: add labels parameter from merge.update to filemerge
|
file |
diff |
annotate
|
| Thu, 08 May 2014 19:45:22 +0200 |
Mads Kiilerich |
largefiles: include largefiles when doing log on a directory (issue4241)
|
file |
diff |
annotate
|
| Thu, 01 May 2014 15:12:49 +0200 |
Mads Kiilerich |
largefiles: better handling of log from other working directory (issue4236)
stable
|
file |
diff |
annotate
|
| Fri, 25 Apr 2014 22:34:09 -0400 |
Matt Harbison |
largefiles: remove directories emptied after their files are moved (issue3515)
stable
|
file |
diff |
annotate
|
| Wed, 05 Mar 2014 15:55:09 -0800 |
Lucas Moscovicz |
largefiles: changed overridelog to work with graphlog
|
file |
diff |
annotate
|
| Wed, 16 Apr 2014 03:05:00 +0900 |
FUJIWARA Katsunori |
i18n: fix "% inside _()" problem
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: revert override, install matchfn outside the try/except restoring it
|
file |
diff |
annotate
|
| Sun, 28 Apr 2013 13:18:25 +0200 |
Mads Kiilerich |
largefiles: simplify revert - use getstandinsstate like other commands do
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: remove dummy assignments for creating an already existing closure
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: remove silent handling of incorrect invocation of restorematchfn
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: copy override, install matchfn outside the try/except restoring it
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: clarify installmatchfn documentation
|
file |
diff |
annotate
|
| Sat, 27 Apr 2013 23:19:52 +0200 |
Mads Kiilerich |
largefiles: use more reasonable locking for update
|
file |
diff |
annotate
|
| Sat, 27 Apr 2013 23:19:52 +0200 |
Mads Kiilerich |
largefiles: full debugdirstate functionality for largefiles
|
file |
diff |
annotate
|
| Sat, 27 Apr 2013 23:19:52 +0200 |
Mads Kiilerich |
largefiles: make cat on standins do something
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: remove confusing handling of .bad return value - it is void
|
file |
diff |
annotate
|
| Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: pass merge ancestor to calculateupdates as a list
|
file |
diff |
annotate
|
| Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: move ancestor selection tweaking from manifestmerge to update function
|
file |
diff |
annotate
|
| Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: remove no more referred "getoutgoinglfiles()"
|
file |
diff |
annotate
|
| Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: use "outgoinghooks" to avoid redundant outgoing check
|
file |
diff |
annotate
|
| Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
|
file |
diff |
annotate
|
| Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: centralize the logic to get outgoing largefiles
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
largefiles: don't prompt when one side of merge was changed but didn't change
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:30:41 +0100 |
Mads Kiilerich |
largefiles: override calculateupdates instead of manifestmerge
|
file |
diff |
annotate
|
| Tue, 11 Feb 2014 09:00:38 -0800 |
Lucas Moscovicz |
hgext: updated extensions to return a baseset when adding symbols
|
file |
diff |
annotate
|
| Sat, 16 Nov 2013 15:54:41 -0500 |
Mads Kiilerich |
largefiles: stylistic cleanup of filemerge
|
file |
diff |
annotate
|
| Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
largefiles: show hashes before prompting for conflict resolution
|
file |
diff |
annotate
|
| Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
largefiles: don't try to explain rename history before prompt for conflicts
|
file |
diff |
annotate
|
| Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
largefiles: drop redundant special handling of merges of renames
|
file |
diff |
annotate
|
| Sun, 01 Dec 2013 14:10:53 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 26 Nov 2013 15:38:33 +0100 |
Mads Kiilerich |
largefiles: don't crash on 'local renamed directory' actions
stable
|
file |
diff |
annotate
|
| Wed, 06 Nov 2013 18:19:04 -0500 |
Augie Fackler |
pathutil: tease out a new library to break an import cycle from canonpath use
|
file |
diff |
annotate
|
| Mon, 28 Oct 2013 22:34:07 +0100 |
Mads Kiilerich |
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
stable
|
file |
diff |
annotate
|
| Fri, 25 Oct 2013 02:33:59 +0800 |
Mads Kiilerich |
largefiles: don't prompt for normal/largefile changes when doing plain updates
stable
|
file |
diff |
annotate
|
| Fri, 25 Oct 2013 02:25:10 +0800 |
Mads Kiilerich |
largefiles: remove extra check for file to get - it _is_ by definition in p2
stable
|
file |
diff |
annotate
|
| Fri, 25 Oct 2013 01:24:10 +0800 |
Mads Kiilerich |
largefiles: don't process merge actions at all when overwriting
stable
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 21:41:01 -0700 |
Siddharth Agarwal |
largefiles: standardize error message for dirty working dir
|
file |
diff |
annotate
|
| Fri, 20 Sep 2013 15:26:30 -0700 |
Siddharth Agarwal |
largefiles: remove bailifchanged check from overridepull (BC)
|
file |
diff |
annotate
|
| Wed, 24 Jul 2013 13:20:44 +0800 |
Wei, Elson |
largefiles: overridematch() should replace the file path instead of extending (issue3934)
stable
|
file |
diff |
annotate
|
| Wed, 22 May 2013 17:31:43 -0500 |
Matt Mackall |
ui: merge prompt text components into a singe string
|
file |
diff |
annotate
|
| Tue, 07 May 2013 05:04:11 +0900 |
FUJIWARA Katsunori |
largefiles: check unknown files with case awareness of the filesystem
stable
|
file |
diff |
annotate
|
| Mon, 15 Apr 2013 23:43:44 +0200 |
Mads Kiilerich |
largefiles: drop lfutil.blockstream - use filechunkiter like everybody else
|
file |
diff |
annotate
|
| Mon, 15 Apr 2013 01:59:11 +0200 |
Mads Kiilerich |
largefiles: implement pull --all-largefiles as a special case of --lfrev
|
file |
diff |
annotate
|
| Mon, 15 Apr 2013 01:59:11 +0200 |
Mads Kiilerich |
largefiles: drop --cache-largefiles again
|
file |
diff |
annotate
|
| Mon, 15 Apr 2013 01:59:04 +0200 |
Mads Kiilerich |
largefiles: introduce pulled() revset expression for use in --lfrev
|
file |
diff |
annotate
|
| Mon, 15 Apr 2013 01:57:16 +0200 |
Mads Kiilerich |
largefiles: introduce pull --lfrev option
|
file |
diff |
annotate
|
| Mon, 15 Apr 2013 01:54:43 +0200 |
Mads Kiilerich |
largefiles: refactor overridepull internals
|
file |
diff |
annotate
|