[Bug 5381] New: Ability to move list of revisions from one branch to another

[bugzilla]

https://bz.mercurial-scm.org/show_bug.cgi?id=5381

Bug ID: 5381
   Summary: Ability to move list of revisions from one branch to
another
   Product: Mercurial
   Version: 3.9.1
  Hardware: PC
OS: Windows
Status: UNCONFIRMED
  Severity: feature
  Priority: wish
 Component: convert
  Assignee: bugzi...@selenic.com
  Reporter: cow...@bbs.darktech.org
CC: duri...@gmail.com, mercurial-de...@selenic.com

When converting a Mercurial repository to Git (not my idea, don't shoot the
messenger) I ran across this issue:
https://github.com/frej/fast-export/issues/9

In my case, it turns out that a branch had two heads. One head was marked as
"closed" while the other continued development. In order to please the Git
gods, I wanted to rename all revisions on the "closed" head to a different
name.

--branchmap allows move all revisions on a particular branch to a different
branch, but I need to only move a subset of the revisions.

For example, given:

@
|
o  __
|  /
o o
|/
o

I want to rename all revisions on the right (closed) branch without touching
the left branch.

http://stackoverflow.com/a/4673148/14731 provides a partial solution but "hg
rebase" requires the creation of a dummy commit containing the new branch new
on top of which we will rebase.

My request is to end up with the exact same number of commits, containing the
exact same metadata except for the branch name.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[Bug 5380] New: Unable to clone project with error 123

[bugzilla]

https://bz.mercurial-scm.org/show_bug.cgi?id=5380

Bug ID: 5380
   Summary: Unable to clone project with error 123
   Product: Mercurial
   Version: 3.7.3
  Hardware: PC
OS: Windows
Status: UNCONFIRMED
  Severity: bug
  Priority: wish
 Component: Mercurial
  Assignee: bugzi...@selenic.com
  Reporter: karme...@gmail.com
CC: mercurial-de...@selenic.com

Created attachment 1931
  --> https://bz.mercurial-scm.org/attachment.cgi?id=1931=edit
Error message

When trying to clone a repository, there is this error:

http://i.imgur.com/Vlo9Din.png

Note this error is not caused by folder name where the project is being cloned,
or because some file name in the project.

The error appear for one user in Windows 10.

-Another user was succeful when cloning from Windows 10 too

-All filenames and folder names are a-zA-Z characters

-The path where the project was being cloned was C:\project


Thanks

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH 1 of 3 v3] demandimport: suppport rejecting modules based on requested properties

[Yuya Nishihara]

On Wed, 21 Sep 2016 19:09:32 +, timeless wrote:
> # HG changeset patch
> # User timeless 
> # Date 1474484347 0
> #  Wed Sep 21 18:59:07 2016 +
> # Node ID 33884775ee4b22109085387b0317aa17db73c483
> # Parent  982fe7cdb28bb263a96b1bc2c9c3b8aedb025ab6
> # Available At https://bitbucket.org/timeless/mercurial-crew
> #  hg pull https://bitbucket.org/timeless/mercurial-crew -r 
> 33884775ee4b
> demandimport: suppport rejecting modules based on requested properties
>
> Some code uses:
> try:
>  from Foo import Bar
> except ImportError:
>  from Foo import Bar2
> 
> demandimport exposes Bar as an unloaded module without checking to
> see whether or not it really exists this enables it to improve loading
> speed.
> 
> Unfortunately, any code that expects to get an ImportError won't get
> one.

Sorry for late reply, but I still don't get why we need "rejects" dict other
than the current "ignore" list. Can't we just add 'Foo.Bar' to ignore?

> without demandimport:
> >>> from contextlib import _GeneratorContextManager
> Traceback (most recent call last):
>   File "", line 1, in 
> ImportError: cannot import name _GeneratorContextManager

In this case, we'll probably be able to reject all unknown attributes since
'contextlib' is known to not be a package. Making a demandmod for that would
be useless.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH 3 of 3 v3] demandimport: reject contextlib._GeneratorContextManager on Py < 3.2

[Yuya Nishihara]

On Wed, 21 Sep 2016 19:09:34 +, timeless wrote:
> # HG changeset patch
> # User timeless 
> # Date 1474429683 0
> #  Wed Sep 21 03:48:03 2016 +
> # Node ID 0070696439eab002f6dd32bcb40eb671daff800a
> # Parent  adb54fd7d90f0ca607432ed7ae884da55ec427de
> # Available At https://bitbucket.org/timeless/mercurial-crew
> #  hg pull https://bitbucket.org/timeless/mercurial-crew -r 
> 0070696439ea
> demandimport: reject contextlib._GeneratorContextManager on Py < 3.2
> 
> decorator expects:
>  from contextlib import _GeneratorContextManager
> to throw an exception on python < 3.2 (issue5373).
> 
> We tell demandimport to throw it.
> 
> diff -r adb54fd7d90f -r 0070696439ea mercurial/demandimport.py
> --- a/mercurial/demandimport.py   Wed Sep 21 18:58:54 2016 +
> +++ b/mercurial/demandimport.py   Wed Sep 21 03:48:03 2016 +
> @@ -313,6 +313,12 @@
>  if os.name != 'nt':
>  reject('distutils', 'msvc9compiler', ImportError, 'No module named 
> _winreg')
>  
> +# decorator imported by ipython from pygments does an import which isn't
> +# friendly to demandimport.
> +if sys.version_info[0] < 3 or sys.version_info[1] < 2:
> +reject('contextlib', '_GeneratorContextManager',
> +   ImportError, 'cannot import name _GeneratorContextManager')

I'm not a fan of duplicating knowledge about module internals unless there's
a measurable win. We could break the current "ignore" list down to fine-tuned
"rejects" rules, but that would end with bloated set of rules we wouldn't
want to maintain.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel