p4cmd 2.3.3__tar.gz → 2.3.5__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {p4cmd-2.3.3 → p4cmd-2.3.5}/PKG-INFO +1 -1
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/p4cmd.py +6 -4
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd.egg-info/PKG-INFO +1 -1
- {p4cmd-2.3.3 → p4cmd-2.3.5}/setup.py +1 -1
- {p4cmd-2.3.3 → p4cmd-2.3.5}/LICENSE +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/README.md +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/__init__.py +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/p4errors.py +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/p4file.py +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/__init__.py +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_DEPOT_ONLY.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_MOVED.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_NEED_SYNC.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_OPEN_FOR_ADD.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_OPEN_FOR_DELETE.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_OPEN_FOR_EDIT.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_UNKNOWN.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_UNTRACKED.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd/resources/perforce_UP_TO_DATE.png +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd.egg-info/SOURCES.txt +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd.egg-info/dependency_links.txt +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/p4cmd.egg-info/top_level.txt +0 -0
- {p4cmd-2.3.3 → p4cmd-2.3.5}/setup.cfg +0 -0
|
@@ -116,7 +116,6 @@ class P4Client(object):
|
|
|
116
116
|
if len(command) > MAX_CMD_LEN:
|
|
117
117
|
# This shouldn't happen, but just in case the command prefix end up really long
|
|
118
118
|
logging.warning(f"Command length: {format(len(command))} exceeds MAX_CMD_LEN {MAX_CMD_LEN} on command: {MAX_CMD_LEN}")
|
|
119
|
-
print(command)
|
|
120
119
|
pipe = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=True)
|
|
121
120
|
output = pipe.stdout
|
|
122
121
|
|
|
@@ -738,9 +737,12 @@ class P4Client(object):
|
|
|
738
737
|
changelists.append([self.__get_dict_value(info_dict, "change"), cl_description])
|
|
739
738
|
|
|
740
739
|
if descriptions:
|
|
741
|
-
|
|
740
|
+
return_list = [pair[1] for pair in changelists]
|
|
741
|
+
return_list.append("default")
|
|
742
742
|
else:
|
|
743
|
-
|
|
743
|
+
return_list = [int(pair[0]) for pair in changelists]
|
|
744
|
+
return_list.append("default")
|
|
745
|
+
return return_list
|
|
744
746
|
|
|
745
747
|
def get_or_make_changelist(self, changelist_description, case_sensitive=False):
|
|
746
748
|
"""
|
|
@@ -762,7 +764,7 @@ class P4Client(object):
|
|
|
762
764
|
case_sensitive=case_sensitive,
|
|
763
765
|
)
|
|
764
766
|
|
|
765
|
-
if len(changelists):
|
|
767
|
+
if len(changelists) > 1: # > 1 because "default" is always appended
|
|
766
768
|
return changelists[0]
|
|
767
769
|
else:
|
|
768
770
|
return self.make_new_changelist(description=changelist_description)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|