wrong "dir" parameter description and logic for hg pull

[hippo]

Parameter dir_ is described as "the name of a local subdirectory containing the working copy". This is wrong, because "hg pull" doesn't have such a parameter. Instead, it has "hg pull [SOURCE]", so I propose to change parameter "dir" to "repository".

[hippo]

proposed fix

[osimons]

You are right - the way that command is made it does not work. You can't call hg with a path to a directory to update (pull -u). To avoid changing the command though, the proper fix is to use dir_ as input to shtools.execute() as named argument dir_=dir_ - ie. so that the command-line execution will use the inside of the repos as current working directory (the command-line runner changes before running command, and resets afterwards). Could you try this alternative patch, please:

bitten/build/hgtools.py

@@ -19 +19 @@
     args = ['pull', '-u']
     if revision:
         args += ['-r', revision.split(':')[0]]
-    args += [dir_]
 
     from bitten.build import shtools
-    returncode = shtools.execute(ctxt, file_='hg', args=args)
+    returncode = shtools.execute(ctxt, file_='hg', args=args, dir_=dir_)
     if returncode != 0:
         ctxt.error('hg pull -u failed (%s)' % returncode)
 

The command presumes a clone is already done, with a default path configured that points to the repository from where to fetch updates. A command to point to new/arbitrary repositories should really be a new command - typically a 'clone' command.

[hippo]

Replying to osimons:

You are right - the way that command is made it does not work. You can't call hg with a path to a directory to update (pull -u). To avoid changing the command though, the proper fix is to use dir_ as input to shtools.execute() as named argument dir_=dir_ - ie. so that the command-line execution will use the inside of the repos as current working directory (the command-line runner changes before running command, and resets afterwards). Could you try this alternative patch, please:

The command presumes a clone is already done, with a default path configured that points to the repository from where to fetch updates.

Sorry for the late reply -- had no time to look in here. Currently I don't have the ability to check your patch on a live installation, but it seems to be correct and I support merging it.

A command to point to new/arbitrary repositories should really be a new command - typically a 'clone' command.

Yes, generally this will be enough.

[osimons]

OK, I've committed the latest patch in [807].

[osimons]

... and closing.