pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
1. skip-blame because just b'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3611
AFFECTED FILES
tests/test-parseindex.t
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Iterating on bytes give you ascii values instead of bytechr so we need to wrap
the bytes in pycompat.bytestr() to get bytechr while iterating.
REPOSITORY
rHG Mer
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The latter throws SyntaxError on Python 3.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3613
AFFECTED FILES
tests/test-parseindex
pulkit created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Comparing None and integers on Python 3 is not allowed and raise error.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3615
AFFECTED FILES
contrib/python3-whitelist
CHANGE DETAILS
diff --git a/contrib/python3-whitelist b/
pulkit updated this revision to Diff 8787.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3579?vs=8734&id=8787
REVISION DETAIL
https://phab.mercurial-scm.org/D3579
AFFECTED FILES
mercurial/state.py
CHANGE DETAILS
diff --git a/mercurial/state.py b/me
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We add r'' prefixes to prevent the transformer adding b'' prefixes.
1. skip-blame because just r'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https:
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
the keys of opts are str here, so we have to convert it to bytes before
passing
into error.Abort()
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.merc
pulkit added a comment.
The number of tests passing on Python 3 is 500 with this patch!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3615
To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
pulkit added inline comments.
INLINE COMMENTS
> test-patch.t:100
> +
> + $ hg import ../c/p --config ui.patch="python '$PWD/exit1.py'"
>applying ../c/p
test-check-code.t says hi:
+ tests/test-patch.t:100:
+ > $ hg import ../c/p --config ui.patch="python '$PWD/exit1.py'"
+ don'
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG64280cd4b454: py3: use pycompat.bytestr() to convert str
into bytes (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3617?vs=87
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG543b7b349b2c: py3: make sure we pass str to date.strftime()
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3590?vs=8761&id=87
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG46e8abc4eb04: py3: fix kwargs handling in hgext/rebase.py
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3616?vs=8788&id=8793
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa40041caf8af: py3: use '%d' for integers in
hgext/infinitepush/__init__.py (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D359
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfc3cca406b2e: py3: add b'' prefixes in
tests/test-bugzilla.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3594?vs=8765&id=8
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5ba0cf22e4d0: py3: fix kwargs handling in hgext/split.py
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3593?vs=8764&id=8798
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGce307af030a2: py3: use print as a function in
tests/test-parseindex.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3603?vs=
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5a3feb2bc9dd: py3: add b'' prefixes in
tests/test-pager.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3598?vs=8769&id=8803
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6e713711331b: py3: add b'' prefixes in
tests/test-custom-filters.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3595?vs=876
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG74c5ddd97008: py3: add b'' prefixes in
tests/test-rebuildstate.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3601?vs=8772&
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc560a4ea6dac: py3: add b'' prefixes in
hgext/convert/subversion.py (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3592?vs=876
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfd8eedcc3fd2: py3: add b'' prefixes in
tests/test-profile.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3599?vs=8770&id=88
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG549e970397b2: py3: use print as a function in
tests/test-pull.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3602?vs=8773&i
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1a09886ab03a: py3: add b'' prefixes in
tests/test-hgrc.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3597?vs=8768&id=8802
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG34592dd3bfa2: py3: add b'' prefixes in
tests/test-progress.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3600?vs=8771&id=8
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd1a49a94c324: py3: add b'' prefixes in
tests/test-extensions-afterloaded.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D359
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5f2dc1b71cf1: py3: use utils.stringutil.forcebytestr to
convert error to bytes (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8fa2b5c85a46: py3: add b'' prefix in
test/test-fileset.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3605?vs=8776&id=8809
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0a10f142299d: py3: suppress the output from .write() calls
in few tests (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3604?v
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1978abdb216c: py3: make sure we open files in bytes mode
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3606?vs=8777&id=8810
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb95a6fb7ae66: py3: fix .write() calls in few tests
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3610?vs=8781&id=8814
REVIS
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG307b19c7c043: py3: add b'' prefixes in
tests/test-parseindex.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3611?vs=8782&id
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG86e0a4bede5d: py3: slice over bytes to prevent getting the
ascii values (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3608?v
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe887381e2976: py3: bytestr() bytes to get bytechar while
iterating on it (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3609?
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa4942675de6b: py3: check for None before comparing with
integers (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3614?vs=8785&
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG42476b8b738b: py3: add 13 new passing tests to whitelist
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3615?vs=8786&id=8820
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGca1cf9b3cce7: py3: use pycompat.fsencode() to convert
tempfile name to bytes (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf0fadc5bea21: py3: use `except error as e` instead of
`except error, e` (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3613?v
pulkit added inline comments.
INLINE COMMENTS
> util.py:1019
> +self.fh.write('%s> setsockopt(%r, %r, %r) -> %r\n' % (
> +self.name, level, optname, value))
> +
If I am understanding this correctly, this can lead to `TypeError: not enough
arguments for format string`
REPOSI
pulkit added inline comments.
INLINE COMMENTS
> util.py:1014
> +
> +def setsockopt(self, level, optname, value):
> +if not self.states:
While debugging the test failure on Python 3.6, the caller at line 751 can pass
5 positional arguments.
Here is the traceback after running test-w
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
1. skip-blame because just b'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3629
AFFECTED FILES
contrib/hg-ssh
CHANGE D
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
1. skip-blame because just b'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3630
AFFECTED FILES
tests/test-ssh-bundle1.t
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3631
AFFECTED FILES
contrib/hg-ssh
CHANGE DETAILS
diff --git a/contrib/hg-ssh b/contrib/hg-ssh
--- a/c
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch uses stringutil.pprint to print a list with bytes in it to prevent
the b'' prefixes in the output.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https:/
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch add b'' prefixes and adds some .encode() calls to convert str to
bytes on Python 3.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This fixes two of sparse tests which were failing on Python 3.
1. skip-blame because just r'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://pha
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3636
AFFECTED FILES
mercurial/debugcommands.py
CHANGE DETAILS
diff --git a/mercurial/debugcommands.py
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
1. skip-blame because just b'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3637
AFFECTED FILES
tests/test-revset2.t
CH
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We ave crossed the 500 mark!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3638
AFFECTED FILES
contrib/python3-whitelist
CHANGE D
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
There are some places in codebase where we try to print the value None,
however
`'%s' % None` is invalid on Python 3. So it will be good to have support in
strin
pulkit added inline comments.
INLINE COMMENTS
> commands.py:3898
> if newdata[cl.rev(n)] < targetphase]
> +if opts['dry_run']:
> +rejected = []
Since all the logic is copy-pasted from phases.advanceboundary and
phases.retractboundary, why not we just pas
pulkit added a comment.
> `hg close-branch` allows closing arbitrary heads. It is equivalent to
> checking out the given revisions and commit an empty change with
> `hg commit --close-branch`.
I am -1 on having a new command for this. How about adding this as a
`--close` flag to `hg
pulkit added a comment.
In https://phab.mercurial-scm.org/D2409#56200, @khanchi97 wrote:
> In https://phab.mercurial-scm.org/D2409#44682, @pulkit wrote:
>
> > In https://phab.mercurial-scm.org/D2409#43891, @khanchi97 wrote:
> >
> > > pulkit: Can you please review it? I have made th
pulkit accepted this revision.
pulkit added a comment.
> I'm very unhappy with how the default value for --terse looks rigt
> now, but it does *work*. The alternative would be to define an
> "optional string" flag type using fancyopts.customopt and then use
> that, leaving the default
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds paths argument to the revsets provided by the remotenames
extension. The revsets are remotenames(), remotebranches() and
remotebookmarks(). paths
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG36a5a1239a15: state: don't have a dict like interface
for cmdstate class (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3572?
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa2f83661f721: state: import the file to write state files
from evolve extension (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG18c6d8b565bf: state: set canonical=True to write
deterministically (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3578?vs=873
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa0e4d654bceb: state: write the version number in plain text
on top of state files (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.o
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG44ef9bb7ccd9: py3: add b'' prefixes in
contrib/hg-ssh (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3629?vs=8837&id=8854
RE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe69628f36196: py3: add b'' prefixes in
tests/test-ssh.t and tests/test-ssh-bundle1.t (authored by pulkit, committed by
).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-s
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG666d90ace0bb: py3: use pycompat.fsencode to convert path to
bytes (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3631?vs=8839
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd7cecea0b254: py3: add r'' prefixes to fix kwargs
handling in hgext/sparse.py (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb0144fc8b681: py3: use stringutil.pprint() to prevent
b'' prefixes in output (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7aeb8aa262eb: py3: add support for NoneType in
stringutil.pprint() (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3635?vs=884
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbacbe829c2bf: py3: use bytes in tests/printenv.py (authored
by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3633?vs=8841&id=8858
REVISI
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The variable iv was used in earlier iterations of the patches and was dropped
since we made sure 'version' is always int. This usage of 'iv' should have
been
rep
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The variable 'version' is going to be used in upcoming series where we will be
using the version number to read a certain state file. However currently,
pyflakes
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
opts['dateformat'] is provided by the user and can be encoded in local
encoding.
Thanks to Yuya for catching.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https:
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdbea87a2d7e8: py3: add b'' prefixes in
tests/test-revset2.t (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3637?vs=8845&id=88
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd6d939a3676f: py3: use encoding.strfromlocal() instead of
pycompat.sysstr() (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D36
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb7e5c53a779e: state: temporary silence pyflakes warning by
removing variable assignment (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbdc4079ceb16: state: fix usage of an unassigned variable
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3640?vs=8862&id=8869
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
There are old state files which don't have a version number in top of them and
hence we have to read them to check whether they are good or not.
ProgrammingError
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdce718404ce6: state: raise CorruptedState error isntead of
ProgrammingError (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D36
pulkit added a comment.
Looks like this needs to be dropped because due to this couple of tests which
were already passing failed. Link to buildbot:
https://buildbot.mercurial-scm.org/builders/py3%20tests/builds/920/steps/run-tests.py%20%28python3%29/logs/stdio
REPOSITORY
rHG Mercurial
RE
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Fatcoring out the logic in a separate function will help us in adding
conditional logic for different versions of graft state files.
REPOSITORY
rHG Mercurial
RE
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The cmdstate class used to have a class variable opts which used to be a dict
which stored all the data for the state. Recent cleanups removed the use of
that
va
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is a step towards make graft use the new state.cmdstate() class. This
patch
replaces the ugly try-except with nice if-else conditionals.
REPOSITORY
rHG Mer
pulkit updated this revision to Diff 8886.
pulkit edited the summary of this revision.
pulkit retitled this revision from "graft: add test for reading old format
state files with new mechanism" to "graft: add test for reading old graftstate
files with new mechanism".
REPOSITORY
rHG Mercurial
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch replaces the logic to read and write data to graftstate file to use
the state.cmdstate() class.
The previous graftstate format didn't had any versio
pulkit added a comment.
In https://phab.mercurial-scm.org/D3187#57349, @khanchi97 wrote:
> okay, but I have some queries like
>
> 1. How about showing revision no. instead of cset id?
I think we should show cset ids. If you want to with rev numbers, go with
that. This should n
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6f67bfe4b82f: state: removing remaining instances of opts
class variable (authored by pulkit, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3653?vs=8884&id=8887#toc
REPOSITOR
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in state.py:46
> i'll delete this line in flight
Thanks for doing that!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3653
To: pulkit, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-graft.t:1417
> Can this line be replaced by `hg log -r 1 -r 2 -T '{node}\n' >
> .hg/graftstate` and remove the need for the extension above (and the need to
> create conflicting changes)?
That's a nice idea. I think we ca
pulkit added a comment.
The code looks mostly good to me. Needs tests for following cases:
- when working directory is dirty
- when we are in an uncommitted merge state
- there is some bookmark movement code, tests for that
INLINE COMMENTS
> commands.py:1508
> +if not message:
>
pulkit added a comment.
In https://phab.mercurial-scm.org/D3557#57279, @joerg.sonnenberger wrote:
> It doesn't seem to fit the argument schema for `hg branch` at all. I'm open
for better places, but I couldn't think of a consistent place.
The branch command has a `--rev` flag whic
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG58b08f4ce5f5: graft: use state.cmdstate() to check whether
graftstate exists (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG476324a304b2: graft: start using the cmdstate class to read
and write data to graftstate (authored by pulkit, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3654?vs=8885&id=889
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG009aa4af5093: graft: factor out function to read graft
state in separate function (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.o
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-graft.t:1417
> An alternative is to use the regular great command to start the process and
> then replace the .hg/graftstate once it's run into conflicts. That might be
> better so we have a repo state (include the merge s
pulkit updated this revision to Diff 8892.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2597?vs=8886&id=8892
REVISION DETAIL
https://phab.mercurial-scm.org/D2597
AFFECTED FILES
tests/test-graft.t
CHANGE DETAILS
diff --git a/tests/test-graft.t b/te
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previous patches start using state.cmdstate() class for statefiles. The class
has a function delete() to delete the state file. This patch replaces the
existing r
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd1690a64268e: graft: add test for reading old graftstate
files with new mechanism (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.o
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Right now, `hg help graft` says:
The -c/--continue option does not reapply earlier options, except for --force.
which should be treated as a bug.
A goo
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds test showing that we don't preserve the user passed --date and
--user values in `hg graft`. I was fixing that and realized this is untested.
Addin
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Reading the user and date information from graftstate during `hg graft
--continue` will help us in preserving the user and date arguments passed when
`hg graft` w
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
After previous patch, we have started preserving user and date values in
graftstate and reusing them during `hg graft --continue`. Now passing --user
and
--date
pulkit added a comment.
Superseded by https://phab.mercurial-scm.org/D3651.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2594
To: pulkit, #hg-reviewers
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing list
pulkit abandoned this revision.
pulkit added a comment.
Superseded by https://phab.mercurial-scm.org/D3654.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2595
To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercuria
1401 - 1500 of 3389 matches
Mail list logo
