- Oct 04, 2014
-
-
Martin von Zweigbergk authored
-
- Oct 03, 2014
-
-
Martin von Zweigbergk authored
-
Martin von Zweigbergk authored
-
- Oct 05, 2014
-
-
Martin von Zweigbergk authored
This improves readability a bit by allowing us to refer to statuses by name rather than index.
-
- Oct 10, 2014
-
-
Martin von Zweigbergk authored
The various status types are currently documented on the dirstate.status() method. Now that we have a class for the status types, it makese sense to document the status types there instead. Only leave the bits related to lookup/unsure in the status() method documentation.
-
- Oct 14, 2014
-
-
Martin von Zweigbergk authored
-
- Oct 10, 2014
-
-
Martin von Zweigbergk authored
Callers of various status() methods (on dirstate, context, repo) get a tuple of 7 elements, where each element is a list of files. This results in lots of uses of indexes where names would be much more readable. For example, "status.ignored" seems clearer than "status[4]" [1]. So, let's introduce a simple named tuple containing the 7 status fields: modified, added, removed, deleted, unknown, ignored, clean. This patch introduces the class and updates the status methods to return instances of it. Later patches will update the callers. [1] Did you even notice that it should have been "status[5]"? (tweaked by mpm to introduce the class in scmutil and only change one user)
-
- Oct 04, 2014
-
-
Martin von Zweigbergk authored
In lfdirstatestatus(), the status tuple gets deconstructed, the lists get updated, and then an identical status tuple gets created and returned. Change it so we simply return the original tuple.
-
Martin von Zweigbergk authored
The status tuple returned from dirstate.status() has an additional field compared to the other status tuples: lookup/unsure. This field is just an optimization and not something most callers care about (they want the resolved value of 'modified' or 'clean'). To prepare for a single future status type, let's separate out the 'lookup' field from the rest by having dirstate.status() return a pair: (lookup, status).
-
- Oct 13, 2014
-
-
Martin von Zweigbergk authored
Now that we have a separate variable for the original 'm1' manifest, we can safely update the nodeid of the file in the new manifest in the same place as we update the flags.
-
Martin von Zweigbergk authored
In localrepo.commitctx(), p1's manifest is copied and used as the basis for the manifest that is about to be committed. The way the copy is updated makes it safe to use it where the original p1's manifest is wanted. For readability, though, a separate variable for each purpose would be clearer. Make it so.
-
Martin von Zweigbergk authored
The 'lock' variable is initialized to None, but before it's ever read, it's assigned again.
-
Martin von Zweigbergk authored
The variable is closely related to 'added' and 'changed', so it makes sense to have it declared next to them.
-
Matt Mackall authored
-
Matt Mackall authored
This is preparation for removing open-coded rebase/graft operations. As a side-effect, this exposes proper renames in the working copy when there are conflicts, which shows up in test-shelve.t.
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
This will help unify all the open-coded graft/rebase operations.
-
Matt Mackall authored
This is in preparation for moving its primary caller into merge.py, which would be a layering violation in the current location.
-
Matt Mackall authored
The duplicatecopies call should be part of the rebase block.
-
Matt Mackall authored
This is prep for refactoring the rebase logic.
-
- Oct 10, 2014
-
-
Matt Mackall authored
-
- Oct 11, 2014
-
-
Matt Mackall authored
This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.
-
- Oct 10, 2014
-
-
Matt Mackall authored
In rebase-like operations where we abandon the second parent, we can correctly fix up the state in setparents.
-
Matt Mackall authored
-
- Oct 07, 2014
-
-
Durham Goode authored
This moves the initial root phase assignment to it's own function. Future patches which make phase calculations lazy will use this function to pre-fill certain phases which can be deduced from the roots.
-
Durham Goode authored
Phase cache invalidation was spread all over the place. Let's add a function to unify it. Later more will be added to this function.
-
- Oct 13, 2014
-
-
Durham Goode authored
A future patch is going to make phase computation lazy, so the phase command can no longer read and diff the entire phase list directly. This changes the phase command to build it's own list for diff purposes.
-
- Oct 10, 2014
-
-
Pierre-Yves David authored
All my friends are dead.
-
Pierre-Yves David authored
All my friends are dead.
-
Pierre-Yves David authored
All my friends are dead.
-
Pierre-Yves David authored
All my friends are dead.
-
Pierre-Yves David authored
All my friends are dead.
-
Pierre-Yves David authored
Now that all usages have been removed, we can drop this not so useful part of the API. We can note that the name was wrong all along...
-
Pierre-Yves David authored
The `set()` method is going away.
-
Pierre-Yves David authored
The `set()` method is going away.
-
Pierre-Yves David authored
The `.set()` function is going away.
-
Pierre-Yves David authored
All custom classes use by revsets are smartsets now. We drop the special-casing.
-
Pierre-Yves David authored
We can use the containment check directly.
-
Pierre-Yves David authored
The `.set()` method is going away.
-