Danek Duvall <danek.duvall@oracle.com> [Fri, 23 Aug 2013 16:05:38 -0700] rev 19627
solaris: sed doesn't recognize a line without a newline
Danek Duvall <danek.duvall@oracle.com> [Fri, 23 Aug 2013 14:31:42 -0700] rev 19626
solaris: test cases can't use grep -a
The -a option to GNU grep isn't available when using Solaris grep. Replace
the one use of grep -a in the testsuite with some in-line Python that does
the equivalent, and add a check for grep -a in check-code.py.
Wojciech Lopata <lopek@fb.com> [Mon, 19 Aug 2013 11:25:23 -0700] rev 19625
revlog: pass node as an argument of addrevision
This change will allow revlog subclasses that override 'checkhash' method
to use custom strategy of computing nodeids without overriding 'addrevision'
method. In particular this change is necessary to implement manifest
compression.
Wojciech Lopata <lopek@fb.com> [Mon, 19 Aug 2013 11:06:38 -0700] rev 19624
revlog: extract 'checkhash' method
Extract method that decides whether nodeid is correct for paricular revision
text and parent nodes. Having this method extracted will allow revlog
subclasses to implement custom way of computing nodes. In particular this
change is necessary to implement manifest compression.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 26 Aug 2013 16:11:21 +0900] rev 19623
histedit: discard meaningless comment about 'hexlify node'
Refactoring in 26b41a902195 made this comment meaningless. The node
gotten by "discovery.findcommonoutgoing()" is hexlified in "between()"
by "repo.set('%n::%n', old, new)".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 26 Aug 2013 16:11:21 +0900] rev 19622
histedit: add description about "histedit --outgoing" to command help
Before this patch, there is no explicit description that argument is
treated as the URL of the destination repository when "--outgoing" is
specified.
This patch adds description about "histedit --outgoing" to command
help of it.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 26 Aug 2013 16:11:21 +0900] rev 19621
histedit: add description about basic histedit function to command help
Before this patch, there is no explicit description that histedit
edits changesets between specified ancestor and the parent of the
working directory: users may notice it by error message "REV is not an
ancestor of working directory".
This patch adds description about basic histedit function to command
help of it.
This patch uses term "ancestor" instead of "parent", because it seems
to be more suitable, and almost all (error) messages already use it.
Augie Fackler <raf@durin42.com> [Fri, 23 Aug 2013 16:16:22 -0400] rev 19620
httpclient: import 0d1b0a8bc549 to fix bug involving late-arriving RST after a response
After a day of hunting this defect, I'm now unable to reproduce the
bug without this patch applied. Regardless, this should fix the
problem I was observing with wireshark. Hopefully this fixes any
flakiness in the buildbot from http2.
Augie Fackler <raf@durin42.com> [Fri, 23 Aug 2013 13:28:18 -0400] rev 19619
progress: stop getting stuck in a nested topic during a long inner step
Convert, for example, has loops like this:
for revision in source_repo:
progress(revisions)
for file in revision:
progresss(file)
Prior to this change, we would start showing the file-level progress
when we encountered a big revision, and then we'd get stuck in showing
file-progress instead of revision progress, often producing many many
instantly-completing progress bars rather than the actually-helpful
top-level revisions bar.
Augie Fackler <raf@durin42.com> [Thu, 15 Aug 2013 21:36:53 -0400] rev 19618
Backed out changeset 77d434760857
Jeff Sickel <jas@corpus-callosum.com> [Thu, 15 Aug 2013 21:35:56 -0400] rev 19617
hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
Matt Mackall <mpm@selenic.com> [Wed, 14 Aug 2013 12:42:22 -0500] rev 19616
debugfs: add hardlink support reporting
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 04 Aug 2013 13:43:39 +0200] rev 19615
obsolete: allow passing a revision to successorssets()
Jeff Sickel <jas@corpus-callosum.com> [Mon, 12 Aug 2013 17:44:31 -0500] rev 19614
factotum: clean up keychain for multiple hg repository authentication
Jeff Sickel <jas@corpus-callosum.com> [Mon, 12 Aug 2013 17:36:49 -0500] rev 19613
9mail: new script to add support for Plan 9 upas/marshal email wrapper
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 23:50:32 -0500] rev 19612
workingfilectx: inherit from basefilectx instead of filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 23:06:10 -0500] rev 19611
basefilectx: move copies from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 23:05:50 -0500] rev 19610
basefilectx: move ancestors from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 23:05:08 -0500] rev 19609
basefilectx: move ancestor from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 23:03:33 -0500] rev 19608
basefilectx: move annotate from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 23:00:11 -0500] rev 19607
basefilectx: move p2 from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:59:10 -0500] rev 19606
basefilectx: move p1 from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:57:21 -0500] rev 19605
basefilectx: move parents from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:56:53 -0500] rev 19604
basefilectx: move cmp from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:56:30 -0500] rev 19603
basefilectx: move isbinary from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:56:18 -0500] rev 19602
basefilectx: move path from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:56:02 -0500] rev 19601
basefilectx: move changectx from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:55:09 -0500] rev 19600
basefilectx: move manifest from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:54:58 -0500] rev 19599
basefilectx: move phasestr from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:54:48 -0500] rev 19598
basefilectx: move phase from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:54:39 -0500] rev 19597
basefilectx: move extra from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:54:31 -0500] rev 19596
basefilectx: move branch from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:54:22 -0500] rev 19595
basefilectx: move description from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:54:12 -0500] rev 19594
basefilectx: move files from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:53:56 -0500] rev 19593
basefilectx: move date from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:53:47 -0500] rev 19592
basefilectx: move user from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:53:23 -0500] rev 19591
basefilectx: move hex from filectx
We also change the function call to use the hex method of its change context
so that it mirrors other such method calls.
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:51:53 -0500] rev 19590
basefilectx: move node from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:51:41 -0500] rev 19589
basefilectx: move linkrev from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:51:30 -0500] rev 19588
basefilectx: move rev from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:51:18 -0500] rev 19587
basefilectx: move filelog from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:51:04 -0500] rev 19586
basefilectx: move flags from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:50:37 -0500] rev 19585
basefilectx: move filenode from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:50:15 -0500] rev 19584
basefilectx: move filerev from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:49:40 -0500] rev 19583
basefilectx: move __ne__ from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:49:03 -0500] rev 19582
basefilectx: move __eq__ from filectx
We also add type checking for extra protection.
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:47:39 -0500] rev 19581
basefilectx: move __hash__ from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:46:54 -0500] rev 19580
basefilectx: move __repr__ from filectx
We change the hardcoded 'filectx' to instead use type(self).__name__ so that objects that
inherit from basefilectx in the future will be able to use the same representation.
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:45:30 -0500] rev 19579
basefilectx: move __str__ from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:45:13 -0500] rev 19578
basefilectx: move __nonzero__ from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:44:51 -0500] rev 19577
basefilectx: move _repopath from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:44:36 -0500] rev 19576
basefilectx: move _filerev from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:44:19 -0500] rev 19575
basefilectx: move _filenode from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:44:06 -0500] rev 19574
basefilectx: move _changeid from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sun, 11 Aug 2013 22:40:59 -0500] rev 19573
basefilectx: move _filelog from filectx
Sean Farley <sean.michael.farley@gmail.com> [Sat, 10 Aug 2013 15:10:26 -0500] rev 19572
basefilectx: add an empty class that will be used as a parent of file contexts
Similar to the refactoring of context, we split common logic from filectx to a
parent class called basefilectx that will be inherited by filectx,
workingfilectx, and memfilectx. This will allow a clear disinction of all the
file contexts:
- filectx: read-only access to a filerevision that is already present in the repo,
- workingfilectx: a filecontext that represents files from the working directory,
- memfilectx: a filecontext that represents files in-memory
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:44:18 -0500] rev 19571
workingctx: inherit from basectx instead of changectx
Sean Farley <sean.michael.farley@gmail.com> [Tue, 06 Aug 2013 15:10:09 -0500] rev 19570
largefiles: remove unnecessary check of instance
The refactoring of all the context objects allows us to simply pass a basectx
to the __new__ constructor and have it return the same object without
allocating new memory.
This also removes the need to import the context module.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 06 Aug 2013 15:11:42 -0500] rev 19569
localrepo: remove unnecessary check of instance
The refactoring of all the context objects allows us to simply pass a basectx
to the __new__ constructor and have it return the same object without
allocating new memory.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 06 Aug 2013 15:11:31 -0500] rev 19568
basectx: remove unnecessary check of instance
The refactoring of all the context objects allows us to simply pass a basectx
to the __new__ constructor and have it return the same object without
allocating new memory.
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:42:41 -0500] rev 19567
basectx: move dirty from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:41:56 -0500] rev 19566
basectx: move dirs from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:41:43 -0500] rev 19565
basectx: move _dirs from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:41:12 -0500] rev 19564
basectx: move diff from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:41:00 -0500] rev 19563
basectx: move match from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:40:36 -0500] rev 19562
basectx: move sub from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:28:54 -0500] rev 19561
basectx: move flags from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:28:40 -0500] rev 19560
basectx: move filenode from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:28:23 -0500] rev 19559
basectx: move _fileinfo from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:26:54 -0500] rev 19558
basectx: move p2 from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:26:15 -0500] rev 19557
basectx: move p1 from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:19:38 -0500] rev 19556
basectx: move parents from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:19:19 -0500] rev 19555
basectx: move mutable from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 18:19:04 -0500] rev 19554
basectx: move phasestr from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:22:49 -0500] rev 19553
basectx: move manifest from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:22:18 -0500] rev 19552
basectx: move __iter__ from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:22:05 -0500] rev 19551
basectx: move __getitem__ from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:21:38 -0500] rev 19550
basectx: move __contains__ from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:21:23 -0500] rev 19549
basectx: move substate from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:00:32 -0500] rev 19548
basectx: move __ne__ from changectx
Sean Farley <sean.michael.farley@gmail.com> [Mon, 05 Aug 2013 17:00:09 -0500] rev 19547
basectx: move __eq__ from changectx
We also add type checking for extra protection.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 18:24:08 -0500] rev 19546
basectx: move __repr__ from changectx
We change the hardcoded 'changectx' to instead use type(self).__name__ so that
objects that inherit from basectx in the future will be able to use the same
representation.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 16:52:13 -0500] rev 19545
basectx: move __int__ from changectx
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 16:50:13 -0500] rev 19544
basectx: change _node to node() in hex
This allows a child class to overload the node() function and still share the
same code for hex().
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 16:49:01 -0500] rev 19543
basectx: move hex from changectx
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 16:48:19 -0500] rev 19542
basectx: move node from changectx
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 19:09:06 -0500] rev 19541
basectx: move rev from changectx
Sean Farley <sean.michael.farley@gmail.com> [Fri, 02 Aug 2013 16:46:23 -0500] rev 19540
basectx: move __str__ from changectx
Sean Farley <sean.michael.farley@gmail.com> [Tue, 06 Aug 2013 16:42:41 -0500] rev 19539
changectx: if passing a basectx then exit __init__ immediately
Sean Farley <sean.michael.farley@gmail.com> [Tue, 06 Aug 2013 15:50:28 -0500] rev 19538
basectx: return a copied context if changeid is already a basectx
This implements a copy constructor so that we can pass a basectx-derived object
in future refactorings.
Sean Farley <sean.michael.farley@gmail.com> [Sat, 13 Jul 2013 19:59:21 -0500] rev 19537
basectx: add an empty class that will be used as a parent of all contexts
At the moment, there is no simple way to check if an object is a context
because there is no common parent class. If there were, we could use
'isinstance' everywhere. Simply having memctx inherit from workingctx or
changectx would allow the use of 'isinstance' but that could lead to some
confusing situations of reading the code since we have three distinct concepts
of a context:
- changectx represents a changeset *already* in the repo, and is therefore immutable
- workingctx represents changes on disk in the working directory
- memctx represents changes solely in memory which may or may not be on disk
Therefore, I propose refactoring context.py to have all three contexts inherit
from a parent class 'basectx'.
Augie Fackler <durin42@gmail.com> [Wed, 24 Jul 2013 19:13:39 -0400] rev 19536
ui.config: fix bug in config alternatives from cc669e4fec95
Matt Mackall <mpm@selenic.com> [Sat, 03 Aug 2013 13:23:48 -0500] rev 19535
proxy: allow wildcards in the no proxy list (issue1821)
Alexander Plavin <alexander@plav.in> [Fri, 19 Jul 2013 02:08:19 +0400] rev 19534
hgweb: cleaner if conditions in changelog() function
This removes unneeded extra nesting level and extra variable, which makes
the code easier to understand.
Alexander Plavin <alexander@plav.in> [Mon, 15 Jul 2013 01:10:22 +0400] rev 19533
hgweb: separate search itself and template generation
This will make it simpler to add other search modes.
Alexander Plavin <alexander@plav.in> [Sat, 03 Aug 2013 00:34:56 +0400] rev 19532
paper: remove unused occurence of changelogtag in views
This variably isn't passed to these views and it always renders to empty string
for this reason. Other themes don't have this issue.