Commit65747a2

committed

submodule.update: the actual update will now mention the revision to which it updates

to_latest_revision would now be honored if possible in dry_run mode

1 parentd0f24c9 commit65747a2Copy full SHA for 65747a2

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=`
`424`	`424`	`is_detached=mrepo.head.is_detached`
`425`	`425`	`#END handle dry_run`
`426`	`426`
`427`		`-ifnotdry_runandto_latest_revision:`
	`427`	`+ifmrepoisnotNoneandto_latest_revision:`
`428`	`428`	`msg_base="Cannot update to latest revision in repository at %r as "%mrepo.working_dir`
`429`	`429`	`ifnotis_detached:`
`430`	`430`	`rref=mrepo.head.ref.tracking_branch()`
`@@ -443,7 +443,7 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=`
`443`	`443`	`# update the working tree`
`444`	`444`	`# handles dry_run`
`445`	`445`	`ifmrepoisnotNoneandmrepo.head.commit.binsha!=binsha:`
`446`		`-progress.update(BEGIN\|UPDWKTREE,0,1,prefix+"Updating working tree at %s for submodule %r"% (self.path,self.name))`
	`446`	`+progress.update(BEGIN\|UPDWKTREE,0,1,prefix+"Updating working tree at %s for submodule %r to revision %s"% (self.path,self.name,hexsha))`
`447`	`447`	`ifnotdry_run:`
`448`	`448`	`ifis_detached:`
`449`	`449`	`# NOTE: for now we force, the user is no supposed to change detached`

Comments

(0)