Show More
@@ -416,7 +416,7 b' class dirnode(object):' | |||
|
416 | 416 | Represent a directory in user working copy with information required for |
|
417 | 417 | the purpose of tersing its status. |
|
418 | 418 | |
|
419 | path is the path to the directory | |
|
419 | path is the path to the directory, without a trailing '/' | |
|
420 | 420 | |
|
421 | 421 | statuses is a set of statuses of all files in this directory (this includes |
|
422 | 422 | all the files in all the subdirectories too) |
@@ -453,7 +453,7 b' class dirnode(object):' | |||
|
453 | 453 | |
|
454 | 454 | # does the dirnode object for subdir exists |
|
455 | 455 | if subdir not in self.subdirs: |
|
456 |
subdirpath = |
|
|
456 | subdirpath = pathutil.join(self.path, subdir) | |
|
457 | 457 | self.subdirs[subdir] = dirnode(subdirpath) |
|
458 | 458 | |
|
459 | 459 | # try adding the file in subdir |
@@ -468,7 +468,7 b' class dirnode(object):' | |||
|
468 | 468 | def iterfilepaths(self): |
|
469 | 469 | """Yield (status, path) for files directly under this directory.""" |
|
470 | 470 | for f, st in self.files: |
|
471 |
yield st, |
|
|
471 | yield st, pathutil.join(self.path, f) | |
|
472 | 472 | |
|
473 | 473 | def tersewalk(self, terseargs): |
|
474 | 474 | """ |
@@ -482,7 +482,7 b' class dirnode(object):' | |||
|
482 | 482 | |
|
483 | 483 | 1) All the files in the directory (including all the files in its |
|
484 | 484 | subdirectories) share the same status and the user has asked us to terse |
|
485 | that status. -> yield (status, dirpath) | |
|
485 | that status. -> yield (status, dirpath). dirpath will end in '/'. | |
|
486 | 486 | |
|
487 | 487 | 2) Otherwise, we do following: |
|
488 | 488 | |
@@ -499,7 +499,7 b' class dirnode(object):' | |||
|
499 | 499 | # Making sure we terse only when the status abbreviation is |
|
500 | 500 | # passed as terse argument |
|
501 | 501 | if onlyst in terseargs: |
|
502 |
yield onlyst, self.path + |
|
|
502 | yield onlyst, self.path + '/' | |
|
503 | 503 | return |
|
504 | 504 | |
|
505 | 505 | # add the files to status list |
@@ -551,7 +551,7 b' def tersedir(statuslist, terseargs):' | |||
|
551 | 551 | # process each sub-directory and build tersedict |
|
552 | 552 | for subdir in rootobj.subdirs.values(): |
|
553 | 553 | for st, f in subdir.tersewalk(terseargs): |
|
554 |
tersedict[st].append( |
|
|
554 | tersedict[st].append(f) | |
|
555 | 555 | |
|
556 | 556 | tersedlist = [] |
|
557 | 557 | for st in allst: |
General Comments 0
You need to be logged in to leave comments.
Login now