repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config.txt: Add missing colons after option name
2007-05-19
Simon Hausmann
More cle
a
nups and s
p
ee
d
ups for labels
and branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Ha
u
smann
C
l
e
a
nup/speed u
p
th
e
branch<> file spl
i
t and
removed
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
More work o
n
the inc
r
e
m
en
t
al impor
t
in
g
of multipl
e
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausm
a
n
n
Give branch
e
s a nice project pref
i
x and
d
on
'
t bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Sim
o
n Hausmann
Star
t
ed rewriting the
b
ranch detectio
n
, based
o
n "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon
H
a
u
s
m
ann
Removed u
n
u
s
e
d cache var
i
ables
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Fix branch
setup after initi
a
l clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hausm
a
nn
Re
m
oved todo
i
tem th
a
t is
implemen
t
ed :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Hausmann
Added supp
o
r
t
for git-
p
4 sync/rebase
-
-with
-
o
r
igin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
sm
a
nn
Bite the b
u
llet and a
u
tomatically
c
onv
e
rt old style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausm
a
n
n
Chan
g
ed the default p4
i
mpor
t
b
ranch to be
r
efs/remotes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Hausmann
Cr
e
ate
t
h
e
o
ri
g
i
n bas
e
d i
m
port b
r
anch using git update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Haus
m
ann
Removed
a
n
cient
and
u
nused code
to fi
n
d the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon H
a
usmann
Removed cleantags
c
o
m
m
and
.
It
does
n
't
h
a
ve
any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Hausmann
C
l
ean up cod
e
dup
l
ication for revision parsin
g
and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
m
o
n
Hausmann
A
l
way
s
pass a sha1
f
or the initia
l
p
a
rent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on H
a
u
s
m
ann
F
i
x
ing syncing (
g
itdi
r
dis
c
overy / cd) for bare reposi
t
ori
e
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Haus
m
a
nn
A
l
i
ttl
e
todo
note before I forget it :), based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
Fix calling git-p4 rebase fr
o
m wi
t
hin a
su
b
direct
o
ry
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
o
n Hausma
n
n
Give a better
h
int if gi
t
-p4 s
u
bmit fai
l
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
Hausmann
Added
t
h
e possibility of
skippin
g
pat
c
hes during
g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Haus
m
ann
Make git-p4 work with bare reposit
o
ries
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
S
imon H
a
us
m
ann
Fi
x
git-p4
c
l
o
n
e
//depot/pr
o
ject (
h
e
a
d import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hau
s
ma
n
n
Co
n
verted to unix
newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
smann
Make submitting wor
k
o
n Windo
w
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
Make sure all pope
n
calls use binary mode (for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
m
o
n Hausmann
A
dded a little
.
b
a
t wr
a
pper from
Mari
u
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Use the subproces
s
module instead
of popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
Docu
m
ent so
m
e
i
mple
m
entation
details, for
the c
u
rious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simo
n
H
a
usman
n
Cleanup,
r
e
mo
v
ed th
e
old
t
agging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
cleanup, renamed self
.
gl
o
b
a
lPrefix
to
self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Haus
m
ann
Mic
r
o clea
n
up
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
imon Haus
m
ann
H
andle pat
c
h errors in
g
i
t-p4
s
ubmit b
e
tter
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A new attem
p
t at
fixi
n
g th
e
c
hild-fast-
i
mport-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
S
l
ightly improved fo
r
matting of the r
a
w_input questi
o
ns
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n
H
au
s
m
ann
Removed th
e
old p
a
tch appl
y
code from g
i
t-p4 subm
i
t
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
a
us
m
ann
Fix the ti
m
ezone formatting
.
Now qgit also dis
p
lays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Ha
u
smann
P
rint an error message of
s
ome sor
t
if git fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon
Hausmann
Allow
f
o
r con
v
enient reb
a
sing aft
e
r
g
it-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n Hausma
n
n
Added a si
m
ple example of us
a
g
e
to the
"docume
n
t
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
fix variable usage (o
o
ps)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausmann
Fix
file determination for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mo
n
Hausma
n
n
Added git-
p
4 c
l
one c
o
n
venience co
m
mand
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Honor --silen
t
fo
r
lab
e
ls
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
ann
Turn
off potentially slow labe
l
detection b
y
d
e
f
ault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Hausm
a
nn
Provide a tr
e
e summary after git-p4
r
ebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on Hausmann
Added
g
it-p4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
C
l
ean
up python c
l
ass
n
ames
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "comp
i
l
a
tion" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausma
n
n
Fi
x
t
h
e docs
f
o
r
git-p4 submit and
turn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon
H
ausmann
Fix
v
ariable usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausma
n
n
A
dded support f
o
r
mapping p4 labels to
git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
mon Hausmann
g
i
t-p4 debug doesn't
n
eed a
g
it repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon H
a
usma
n
n
Do
n
't
t
ry
t
o parse
a
ny opt
i
ons with git-p4 debug
but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausm
a
nn
Prefer git command over git-c
o
mman
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n
H
a
usma
n
n
Minor
c
osmetic
fi
x
let for t
h
e g
i
t-p
4
submi
t
sync qu
e
s
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
imon H
a
usmann
D
iffe
r
e
n
t
v
e
rsions of p4 hav
e
different output f
o
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Sim
o
n Hausma
n
n
Use the new increment
a
l im
p
ort sty
l
e
by
default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Si
m
on
H
ausmann
Ma
k
e
i
t
p
o
ssible
t
o
r
un git
-
p
4 submit from within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand ne
w
s
m
art i
n
cremen
t
a
l
i
m
port that
doe
s
n't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausm
a
nn
Set the defaul
t
branch in
r
un,
not in the construc
t
or
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
H
e
lper f
u
nct
i
on to chec
k
the exist
a
nce of a r
e
vision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Added
s
o
me
h
el
p
er
f
unc
t
i
on(s)
t
o
p
arse the dep
o
t path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
H
ausma
n
n
Changed
t
he default branch for imports from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n Hausman
n
Changed the format of the imported log
message slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausma
n
n
Removed the
.
py exte
n
sion from git-p4 as it
'
s annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Don
'
t show the submi
t
t
e
mplate and the di
f
f
f
irs
t
i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon H
a
us
m
a
n
n
M
ake it
p
ossible to
invoke git
-
p4 f
r
om within subdirector
i
es
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Made
-
-ap
p
ly-a
s
-patch the defau
l
t
for
g
i
t-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hau
s
m
a
nn
Fix support for deletions in git-
p
4
s
ubmit whe
n
u
s
in
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausmann
Adde
d
ex
p
e
r
ime
n
t
al but super-fast --
a
pply-as
-
pat
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon
Hausma
n
n
Documentation enhan
c
ements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Start of t
h
e git-
p
4 docume
n
tation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mo
n
Hausmann
R
e
moved p
4
-fast-export
a
nd p
4
-git-sy
n
c as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
Fixed
t
h
e
i
n
itia
l
version
i
m
port b
y
getting
t
he
f
i
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausmann
Ad
d
ed missing "sel
f
"s to make the
script e
v
aluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
usmann
Completely u
n
tested
"merge"
o
f p4-fas
t
-e
x
port
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hausmann
s
y
nc-to-perforce is now called
s
ubmit and fi
x
ed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
H
a
u
s
man
n
Part
o
f
the co
d
e
i
s
c
opyright by Tr
o
llt
e
ch ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
First (unte
s
ted)
at
t
empt
at mi
g
ra
t
ing p4
-
git-
s
ync
i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
P
r
o
v
ide
a little b
i
t of he
l
p descri
p
t
i
on for t
h
e git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Start moving the git-
p
4 tools into one single
scri
p
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
Pass the
r
ight n
u
mber of argume
n
t
s
to commit, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Improved
t
he gi
t
dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hau
s
m
a
nn
Defau
l
t
t
o interacti
v
e syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
Hausman
n
Use
p4 revert
.
.
.
i
n
stead of re
v
ert -a
.
.
.
after su
b
mitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Ha
u
s
mann
Auto-detect the cu
r
r
e
nt git
b
ranch
b
efore
s
ub
m
itting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n Haus
m
ann
I
gnore A
p
ple
r
esource
f
iles when imp
o
rting from perf
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Be
nice and use /usr/bin/env pytho
n
for t
h
e git
-
p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Hausmann
Automatically operate on a tem
p
o
ra
r
y bran
c
h, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Lots of
bugfi
x
es t
o
p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Fix git-d
i
r option and
a
llow
r
eading lo
g
substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hau
s
mann
F
i
rst ve
r
sion
o
f a new script to submit
c
hang
e
s ba
c
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
ann
Sp
l
it
u
p th
e
cache commandline optio
n
s into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Re
d
uce t
h
e number
of f
a
ls
e
"me
r
ges
"
by skipping "br
a
nc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausmann
More
w
ork
o
n
b
r
an
c
h detecti
o
n by implement
i
n
g changeIs
B
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon Hausmann
More code cleanup
s
and preparations for more b
r
anc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Minor
code cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
smann
Make th
e
p4 data/command cache configur
a
ble through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next